diff --git a/cash-api/order-server/src/main/java/com/czg/controller/DistributionPayController.java b/cash-api/order-server/src/main/java/com/czg/controller/DistributionPayController.java index 1afaa9c5..c4f2e5a3 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/DistributionPayController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/DistributionPayController.java @@ -58,8 +58,7 @@ public class DistributionPayController { */ @PostMapping("/mchRecharge") @Debounce(value = "#payParam.userId") - public CzgResult> mchRecharge(@RequestHeader Long shopId, HttpServletRequest request, @Validated @RequestBody MkDistributionPayDTO payParam) { - payParam.setShopId(shopId); + public CzgResult> mchRecharge(HttpServletRequest request, @Validated @RequestBody MkDistributionPayDTO payParam) { AssertUtil.isBlank(payParam.getCode(), "微信code不为空"); return CzgResult.success(payService.mchRecharge(ServletUtil.getClientIP(request), payParam)); } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DistributionPayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DistributionPayServiceImpl.java index 0f1c3b73..c9fce3b8 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DistributionPayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DistributionPayServiceImpl.java @@ -69,7 +69,7 @@ public class DistributionPayServiceImpl implements DistributionPayService { throw new CzgException("当前未开启购买分销配置"); } - OrderPayment orderPayment = new OrderPayment().setShopId(payParam.getShopId()).setSourceId(userId) + OrderPayment orderPayment = new OrderPayment().setShopId(payParam.getShopId()).setSourceId(isRecharge ? payParam.getShopId() : userId) .setPayType(isRecharge ? "distributionRecharge" : "distribution").setOrderNo(payParam.getPlatformType() + IdUtil.getSnowflakeNextId()).setAmount(detail.getPayAmount()); orderPaymentService.save(orderPayment);