From e9ef1b0facffeb854984eb2c78cef01a679a1316 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Sat, 17 Jan 2026 10:25:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/controller/DistributionPayController.java | 4 ++-- .../src/main/java/com/czg/order/entity/ShopMerchant.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 d5eb12f1f..054b30afc 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 @@ -46,8 +46,8 @@ public class DistributionPayController { */ @PostMapping("/mchRecharge") @Debounce(value = "#payParam.userId") - public CzgResult> mchRecharge(HttpServletRequest request, @Validated @RequestBody MkDistributionPayDTO payParam) { + public CzgResult> mchRecharge(@Validated @RequestBody MkDistributionPayDTO payParam) { AssertUtil.isBlank(payParam.getCode(), "微信code不为空"); - return CzgResult.success(payService.mchRecharge(ServletUtil.getClientIP(request), payParam)); + return CzgResult.success(payService.mchRecharge(payParam)); } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopMerchant.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopMerchant.java index 2e345d184..8387ce77d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopMerchant.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopMerchant.java @@ -20,7 +20,7 @@ import java.time.LocalDateTime; @Data @NoArgsConstructor @AllArgsConstructor -@Table("tb_shop_merchant2") +@Table("tb_shop_merchant") public class ShopMerchant implements Serializable { @Serial