diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/wxpay/controller/WxPayController.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/wxpay/controller/WxPayController.java index d6e44bd..70759b0 100644 --- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/wxpay/controller/WxPayController.java +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/wxpay/controller/WxPayController.java @@ -415,7 +415,7 @@ public class WxPayController extends AbstractWxPayApiController { System.out.println(returnMsg); if (!WxPayKit.codeIsOk(returnCode)) { // 测试用 - return new AjaxResult().success("http://localhost:9201/statics/1880498021541883905/payQRCode2.png"); + return new AjaxResult().success("http://192.168.9.50/img/2/payQRCode2_20250121035132A001.png"); // return new AjaxResult().addError("error:" + returnMsg); } String resultCode = result.get("result_code"); diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UOrderServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UOrderServiceImpl.java index 5788999..3b5d191 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UOrderServiceImpl.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UOrderServiceImpl.java @@ -185,6 +185,10 @@ public class UOrderServiceImpl extends ServiceImpl impleme order.setUserId(SecurityUtils.getUserId()); order.setStatus(OrderStatusEnum.UNPAID.getCode()); order.setOrderNo(System.currentTimeMillis() + StrUtil.EMPTY); + if (ObjectUtil.isNotNull(order.getPackageId())) { + UPackage uPackage = packageService.getById(order.getPackageId()); + order.setOrderAmount(uPackage.getPrice()); + } this.save(order); List billRules = billRuleMapper.selectList(Wrappers.lambdaQuery()); billRules.stream().findFirst().ifPresent(billRule -> {