在线支付订单
This commit is contained in:
parent
8ef6ff3c39
commit
ec11f3abf2
|
@ -1400,34 +1400,30 @@ public class AliPayController {
|
|||
}
|
||||
}
|
||||
|
||||
String isTravelFree = commonInfoService.findOne(460).getValue();
|
||||
if(isTravelFree.equals("是")){
|
||||
payPackageOrderResult(orders.getOrdersNo());
|
||||
}else {
|
||||
//通知页面地址
|
||||
CommonInfo one = commonInfoService.findOne(19);
|
||||
String returnUrl = one.getValue() + "/#/pages/task/recharge";
|
||||
CommonInfo one3 = commonInfoService.findOne(12);
|
||||
String name = one3.getValue();
|
||||
PayDetails payDetails1 = payDetailsDao.selectByOrderId(orders.getOrdersNo());
|
||||
if (payDetails1 == null) {
|
||||
PayDetails payDetails = new PayDetails();
|
||||
payDetails.setState(0);
|
||||
payDetails.setCreateTime(sdf.format(new Date()));
|
||||
payDetails.setOrderId(orders.getOrdersNo());
|
||||
payDetails.setUserId(orders.getUserId());
|
||||
if (orders.getUserPackageDetailId() != null) {
|
||||
payDetails.setMoney(orders.getTaxiMoney().doubleValue());
|
||||
} else {
|
||||
payDetails.setMoney(orders.getPayMoney().doubleValue());
|
||||
}
|
||||
payDetails.setClassify(6);
|
||||
payDetails.setType(1);
|
||||
payDetailsDao.insert(payDetails);
|
||||
//通知页面地址
|
||||
CommonInfo one = commonInfoService.findOne(19);
|
||||
String returnUrl = one.getValue() + "/#/pages/task/recharge";
|
||||
CommonInfo one3 = commonInfoService.findOne(12);
|
||||
String name = one3.getValue();
|
||||
PayDetails payDetails1 = payDetailsDao.selectByOrderId(orders.getOrdersNo());
|
||||
if (payDetails1 == null) {
|
||||
PayDetails payDetails = new PayDetails();
|
||||
payDetails.setState(0);
|
||||
payDetails.setCreateTime(sdf.format(new Date()));
|
||||
payDetails.setOrderId(orders.getOrdersNo());
|
||||
payDetails.setUserId(orders.getUserId());
|
||||
if (orders.getUserPackageDetailId() != null) {
|
||||
payDetails.setMoney(orders.getTaxiMoney().doubleValue());
|
||||
} else {
|
||||
payDetails1.setClassify(6);
|
||||
payDetailsDao.updateById(payDetails1);
|
||||
payDetails.setMoney(orders.getPayMoney().doubleValue());
|
||||
}
|
||||
payDetails.setClassify(6);
|
||||
payDetails.setType(1);
|
||||
payDetailsDao.insert(payDetails);
|
||||
} else {
|
||||
payDetails1.setClassify(6);
|
||||
payDetailsDao.updateById(payDetails1);
|
||||
}
|
||||
// if (type == 1) {
|
||||
// if(orders.getUserPackageDetailId() !=null ){
|
||||
// return payApp(name, orders.getOrdersNo(), orders.getTaxiMoney().doubleValue());
|
||||
|
@ -1442,7 +1438,6 @@ public class AliPayController {
|
|||
// }
|
||||
// }
|
||||
payOrderResult(orders.getOrdersNo());
|
||||
}
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
|
|
|
@ -644,36 +644,32 @@ public class WxServiceImpl implements WxService {
|
|||
}
|
||||
}
|
||||
|
||||
String isTravelFree = commonInfoService.findOne(460).getValue();
|
||||
if(isTravelFree.equals("是")){
|
||||
payPackageOrderResult(orders.getOrdersNo(),classify);
|
||||
}else {
|
||||
PayDetails payDetails1 = payDetailsDao.selectByOrderId(orders.getOrdersNo());
|
||||
if (payDetails1 == null) {
|
||||
PayDetails payDetails = new PayDetails();
|
||||
payDetails.setState(0);
|
||||
payDetails.setCreateTime(sdf.format(new Date()));
|
||||
payDetails.setOrderId(orders.getOrdersNo());
|
||||
payDetails.setUserId(orders.getUserId());
|
||||
if (orders.getUserPackageDetailId() != null) {
|
||||
payDetails.setMoney(orders.getTaxiMoney().doubleValue());
|
||||
} else {
|
||||
payDetails.setMoney(orders.getPayMoney().doubleValue());
|
||||
}
|
||||
payDetails.setClassify(classify);
|
||||
payDetails.setType(1);
|
||||
payDetailsDao.insert(payDetails);
|
||||
PayDetails payDetails1 = payDetailsDao.selectByOrderId(orders.getOrdersNo());
|
||||
if (payDetails1 == null) {
|
||||
PayDetails payDetails = new PayDetails();
|
||||
payDetails.setState(0);
|
||||
payDetails.setCreateTime(sdf.format(new Date()));
|
||||
payDetails.setOrderId(orders.getOrdersNo());
|
||||
payDetails.setUserId(orders.getUserId());
|
||||
if (orders.getUserPackageDetailId() != null) {
|
||||
payDetails.setMoney(orders.getTaxiMoney().doubleValue());
|
||||
} else {
|
||||
payDetails1.setClassify(classify);
|
||||
payDetailsDao.updateById(payDetails1);
|
||||
payDetails.setMoney(orders.getPayMoney().doubleValue());
|
||||
}
|
||||
payDetails.setClassify(classify);
|
||||
payDetails.setType(1);
|
||||
payDetailsDao.insert(payDetails);
|
||||
} else {
|
||||
payDetails1.setClassify(classify);
|
||||
payDetailsDao.updateById(payDetails1);
|
||||
}
|
||||
// if(orders.getUserPackageDetailId() !=null ){
|
||||
// return pay(orders.getTaxiMoney().doubleValue(), classify, orders.getUserId(), orders.getOrdersNo(),request);
|
||||
// }else{
|
||||
// return pay(orders.getPayMoney().doubleValue(), classify, orders.getUserId(), orders.getOrdersNo(),request);
|
||||
// }
|
||||
payOrderResult(orders.getOrdersNo());
|
||||
}
|
||||
payOrderResult(orders.getOrdersNo());
|
||||
|
||||
return Result.success();
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue