yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

在线支付订单

This commit is contained in:
曹磊 2024-07-19 10:38:55 +08:00
parent 8ef6ff3c39
commit ec11f3abf2
2 changed files with 41 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java
View File

@ -1400,34 +1400,30 @@ public class AliPayController {
} }
} }
String isTravelFree = commonInfoService.findOne(460).getValue(); //通知页面地址
if(isTravelFree.equals("是")){ CommonInfo one = commonInfoService.findOne(19);
payPackageOrderResult(orders.getOrdersNo()); String returnUrl = one.getValue() + "/#/pages/task/recharge";
}else { CommonInfo one3 = commonInfoService.findOne(12);
//通知页面地址 String name = one3.getValue();
CommonInfo one = commonInfoService.findOne(19); PayDetails payDetails1 = payDetailsDao.selectByOrderId(orders.getOrdersNo());
String returnUrl = one.getValue() + "/#/pages/task/recharge"; if (payDetails1 == null) {
CommonInfo one3 = commonInfoService.findOne(12); PayDetails payDetails = new PayDetails();
String name = one3.getValue(); payDetails.setState(0);
PayDetails payDetails1 = payDetailsDao.selectByOrderId(orders.getOrdersNo()); payDetails.setCreateTime(sdf.format(new Date()));
if (payDetails1 == null) { payDetails.setOrderId(orders.getOrdersNo());
PayDetails payDetails = new PayDetails(); payDetails.setUserId(orders.getUserId());
payDetails.setState(0); if (orders.getUserPackageDetailId() != null) {
payDetails.setCreateTime(sdf.format(new Date())); payDetails.setMoney(orders.getTaxiMoney().doubleValue());
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);
} else { } else {
payDetails1.setClassify(6); payDetails.setMoney(orders.getPayMoney().doubleValue());
payDetailsDao.updateById(payDetails1);
} }
payDetails.setClassify(6);
payDetails.setType(1);
payDetailsDao.insert(payDetails);
} else {
payDetails1.setClassify(6);
payDetailsDao.updateById(payDetails1);
}
// if (type == 1) { // if (type == 1) {
// if(orders.getUserPackageDetailId() !=null ){ // if(orders.getUserPackageDetailId() !=null ){
// return payApp(name, orders.getOrdersNo(), orders.getTaxiMoney().doubleValue()); // return payApp(name, orders.getOrdersNo(), orders.getTaxiMoney().doubleValue());
@ -1442,7 +1438,6 @@ public class AliPayController {
// } // }
// } // }
payOrderResult(orders.getOrdersNo()); payOrderResult(orders.getOrdersNo());
}
return Result.success(); return Result.success();
} }

42
src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java
View File

@ -644,36 +644,32 @@ public class WxServiceImpl implements WxService {
} }
} }
String isTravelFree = commonInfoService.findOne(460).getValue(); PayDetails payDetails1 = payDetailsDao.selectByOrderId(orders.getOrdersNo());
if(isTravelFree.equals("是")){ if (payDetails1 == null) {
payPackageOrderResult(orders.getOrdersNo(),classify); PayDetails payDetails = new PayDetails();
}else { payDetails.setState(0);
PayDetails payDetails1 = payDetailsDao.selectByOrderId(orders.getOrdersNo()); payDetails.setCreateTime(sdf.format(new Date()));
if (payDetails1 == null) { payDetails.setOrderId(orders.getOrdersNo());
PayDetails payDetails = new PayDetails(); payDetails.setUserId(orders.getUserId());
payDetails.setState(0); if (orders.getUserPackageDetailId() != null) {
payDetails.setCreateTime(sdf.format(new Date())); payDetails.setMoney(orders.getTaxiMoney().doubleValue());
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);
} else { } else {
payDetails1.setClassify(classify); payDetails.setMoney(orders.getPayMoney().doubleValue());
payDetailsDao.updateById(payDetails1);
} }
payDetails.setClassify(classify);
payDetails.setType(1);
payDetailsDao.insert(payDetails);
} else {
payDetails1.setClassify(classify);
payDetailsDao.updateById(payDetails1);
}
// if(orders.getUserPackageDetailId() !=null ){ // if(orders.getUserPackageDetailId() !=null ){
// return pay(orders.getTaxiMoney().doubleValue(), classify, orders.getUserId(), orders.getOrdersNo(),request); // return pay(orders.getTaxiMoney().doubleValue(), classify, orders.getUserId(), orders.getOrdersNo(),request);
// }else{ // }else{
// return pay(orders.getPayMoney().doubleValue(), classify, orders.getUserId(), orders.getOrdersNo(),request); // return pay(orders.getPayMoney().doubleValue(), classify, orders.getUserId(), orders.getOrdersNo(),request);
// } // }
payOrderResult(orders.getOrdersNo()); payOrderResult(orders.getOrdersNo());
}
return Result.success(); return Result.success();
} }