czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'prod' into test

Browse Source
This commit is contained in:
wangw
2026-02-04 14:21:01 +08:00
parent 9da67fc67f ec1bc6a156
commit 4deba098ce
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-api/market-server/src/main/java/com/czg/controller/admin/ADisGroupController.java
View File

@@ -41,7 +41,7 @@ public class ADisGroupController {
if (share == null) {
return CzgResult.success(mkDistributionGroupService.save(group));
} else {
return CzgResult.success(mkDistributionGroupService.updateById(group, false));
return CzgResult.success(mkDistributionGroupService.updateById(group));
}
}
}

1
cash-api/market-server/src/main/java/com/czg/controller/admin/AShareBaseController.java
View File

@@ -41,6 +41,7 @@ public class AShareBaseController {
if (share == null) {
return CzgResult.success(mkShareBaseService.save(shareBase));
} else {
shareBase.setCreateTime(share.getCreateTime());
return CzgResult.success(mkShareBaseService.updateById(shareBase, false));
}
}

6
cash-api/order-server/src/main/java/com/czg/controller/pay/OrderPayController.java
View File

@@ -181,11 +181,9 @@ public class OrderPayController {
@PostMapping("/shopPayApi/js2Pay")
@Debounce(value = "#payParam.checkOrderPay.orderId")
public CzgResult<Map<String, Object>> js2PayOrder(HttpServletRequest request, @RequestBody OrderPayParamDTO payParam) {
if ("alipay".equals(payParam.getPayType())) {
if ("ALIPAY".equals(payParam.getPayType())) {
payParam.setPayType(PayCst.Type.ALIPAY);
} else if ("aliPay".equals(payParam.getPayType())) {
payParam.setPayType(PayCst.Type.ALIPAY);
} else if ("wechatPay".equals(payParam.getPayType())) {
} else if ("WECHAT".equals(payParam.getPayType())) {
payParam.setPayType(PayCst.Type.WECHAT);
} else {
throw new CzgException(payParam.getPayType() + "支付方式错误");