From 416263c9b1f857bdefe2bd9331c683a42aea4854 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 12 Mar 2025 10:47:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9A=82=E6=9C=AA=E5=BC=80=E9=80=9A?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/service/order/service/impl/PayServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java index a69ff2e9..b20f1f58 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java @@ -737,7 +737,7 @@ public class PayServiceImpl implements PayService { try { return shopMerchantService.getById(shopId); } catch (Exception e) { - throw new CzgException(e.getMessage()); + throw new CzgException("暂未开通支付"); } } From d80a6b747e38c1fe0f6760ea73d197366bc71d9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 12 Mar 2025 11:01:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=95=86=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/controller/admin/ShopMerchantController.java | 5 +++-- .../com/czg/account/dto/merchant/ShopMerchantEditDTO.java | 2 ++ .../java/com/czg/account/service/ShopMerchantService.java | 2 +- .../account/service/impl/ShopMerchantServiceImpl.java | 5 +++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java index 0ea4bd3c..54b4ca5c 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java @@ -24,13 +24,14 @@ public class ShopMerchantController { /** * 商户支付信息获取 * 权限标识: shopMerchant:detail + * @param shopId 店铺id * @return 支付信息 */ @SaAdminCheckRole("管理员") @SaAdminCheckPermission(value = "shopMerchant:detail", name = "商户支付信息获取") @GetMapping - public CzgResult detail() { - return CzgResult.success(shopMerchantService.detail()); + public CzgResult detail(@RequestParam Integer shopId) { + return CzgResult.success(shopMerchantService.detail(shopId)); } /** diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/merchant/ShopMerchantEditDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/merchant/ShopMerchantEditDTO.java index 8590a4ca..8f52060a 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/merchant/ShopMerchantEditDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/merchant/ShopMerchantEditDTO.java @@ -1,6 +1,7 @@ package com.czg.account.dto.merchant; import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.Data; /** @@ -8,6 +9,7 @@ import lombok.Data; */ @Data public class ShopMerchantEditDTO { + @NotNull(message = "店铺id不为空") private Long shopId; @NotEmpty(message = "支付系统商户id不为空") private String storeId; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopMerchantService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopMerchantService.java index feccb67d..9422a925 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopMerchantService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopMerchantService.java @@ -14,7 +14,7 @@ import java.io.Serializable; */ public interface ShopMerchantService extends IService { - ShopMerchant detail(); + ShopMerchant detail(Integer shopId); Boolean edit(ShopMerchantEditDTO shopMerchantEditDTO); @Override diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopMerchantServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopMerchantServiceImpl.java index df1a7b17..2f65260d 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopMerchantServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopMerchantServiceImpl.java @@ -26,8 +26,8 @@ import java.io.Serializable; public class ShopMerchantServiceImpl extends ServiceImpl implements ShopMerchantService { @Override - public ShopMerchant detail() { - ShopMerchant one = queryChain().eq(ShopMerchant::getShopId, StpKit.USER.getLoginIdAsLong()).one(); + public ShopMerchant detail(Integer shopId) { + ShopMerchant one = queryChain().eq(ShopMerchant::getShopId, shopId).one(); return one == null ? new ShopMerchant() : one; } @@ -37,6 +37,7 @@ public class ShopMerchantServiceImpl extends ServiceImpl Date: Wed, 12 Mar 2025 11:16:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=95=86=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/controller/admin/ShopMerchantController.java | 1 - .../service/account/service/impl/ShopMerchantServiceImpl.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java index 54b4ca5c..33ab62e4 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java @@ -43,7 +43,6 @@ public class ShopMerchantController { @SaAdminCheckPermission(value = "shopMerchant:edit", name = "商户支付信息修改") @PutMapping public CzgResult edit(@RequestBody @Validated ShopMerchantEditDTO shopMerchantEditDTO) { - shopMerchantEditDTO.setShopId(StpKit.USER.getLoginIdAsLong()); return CzgResult.success(shopMerchantService.edit(shopMerchantEditDTO)); } } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopMerchantServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopMerchantServiceImpl.java index 2f65260d..72c178e7 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopMerchantServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopMerchantServiceImpl.java @@ -31,7 +31,7 @@ public class ShopMerchantServiceImpl extends ServiceImpl