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

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

@ -1400,10 +1400,6 @@ public class AliPayController {
} }
} }
String isTravelFree = commonInfoService.findOne(460).getValue();
if(isTravelFree.equals("是")){
payPackageOrderResult(orders.getOrdersNo());
}else {
//通知页面地址 //通知页面地址
CommonInfo one = commonInfoService.findOne(19); CommonInfo one = commonInfoService.findOne(19);
String returnUrl = one.getValue() + "/#/pages/task/recharge"; String returnUrl = one.getValue() + "/#/pages/task/recharge";
@ -1442,7 +1438,6 @@ public class AliPayController {
// } // }
// } // }
payOrderResult(orders.getOrdersNo()); payOrderResult(orders.getOrdersNo());
}
return Result.success(); return Result.success();
} }

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

@ -644,10 +644,6 @@ 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()); PayDetails payDetails1 = payDetailsDao.selectByOrderId(orders.getOrdersNo());
if (payDetails1 == null) { if (payDetails1 == null) {
PayDetails payDetails = new PayDetails(); PayDetails payDetails = new PayDetails();
@ -673,7 +669,7 @@ public class WxServiceImpl implements WxService {
// 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();
} }