WFC/be.wfc
2
0
Fork 0
Code Activity

feat: 套餐金额

Browse Source
This commit is contained in:
caiyuchao
2025-01-22 11:50:58 +08:00
parent 575e101082
commit f7f8642401
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/wxpay/controller/WxPayController.java
View File

@@ -415,7 +415,7 @@ public class WxPayController extends AbstractWxPayApiController {
System.out.println(returnMsg); System.out.println(returnMsg);
if (!WxPayKit.codeIsOk(returnCode)) { 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); // return new AjaxResult().addError("error:" + returnMsg);
} }
String resultCode = result.get("result_code"); String resultCode = result.get("result_code");

4
wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UOrderServiceImpl.java
View File

@@ -185,6 +185,10 @@ public class UOrderServiceImpl extends ServiceImpl<UOrderMapper, UOrder> impleme
order.setUserId(SecurityUtils.getUserId()); order.setUserId(SecurityUtils.getUserId());
order.setStatus(OrderStatusEnum.UNPAID.getCode()); order.setStatus(OrderStatusEnum.UNPAID.getCode());
order.setOrderNo(System.currentTimeMillis() + StrUtil.EMPTY); order.setOrderNo(System.currentTimeMillis() + StrUtil.EMPTY);
if (ObjectUtil.isNotNull(order.getPackageId())) {
UPackage uPackage = packageService.getById(order.getPackageId());
order.setOrderAmount(uPackage.getPrice());
}
this.save(order); this.save(order);
List<UBillRule> billRules = billRuleMapper.selectList(Wrappers.lambdaQuery()); List<UBillRule> billRules = billRuleMapper.selectList(Wrappers.lambdaQuery());
billRules.stream().findFirst().ifPresent(billRule -> { billRules.stream().findFirst().ifPresent(billRule -> {