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..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
@@ -24,13 +24,14 @@ public class ShopMerchantController {
     /**
      * 商户支付信息获取
      * 权限标识: shopMerchant:detail
+     * @param shopId 店铺id
      * @return 支付信息
      */
     @SaAdminCheckRole("管理员")
     @SaAdminCheckPermission(value = "shopMerchant:detail", name = "商户支付信息获取")
     @GetMapping
-    public CzgResult<ShopMerchant> detail() {
-        return CzgResult.success(shopMerchantService.detail());
+    public CzgResult<ShopMerchant> detail(@RequestParam Integer shopId) {
+        return CzgResult.success(shopMerchantService.detail(shopId));
     }
 
     /**
@@ -42,7 +43,6 @@ public class ShopMerchantController {
     @SaAdminCheckPermission(value = "shopMerchant:edit", name = "商户支付信息修改")
     @PutMapping
     public CzgResult<Boolean> edit(@RequestBody @Validated ShopMerchantEditDTO shopMerchantEditDTO) {
-        shopMerchantEditDTO.setShopId(StpKit.USER.getLoginIdAsLong());
         return CzgResult.success(shopMerchantService.edit(shopMerchantEditDTO));
     }
 }
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> {
 
-    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..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
@@ -26,17 +26,18 @@ import java.io.Serializable;
 public class ShopMerchantServiceImpl extends ServiceImpl<ShopMerchantMapper, ShopMerchant> 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;
     }
 
-    @CacheEvict(key = "#shopMerchantEditDTO.id")
+    @CacheEvict(key = "#shopMerchantEditDTO.shopId")
     @Override
     public Boolean edit(ShopMerchantEditDTO shopMerchantEditDTO) {
         ShopMerchant shopMerchant = queryChain().eq(ShopMerchant::getShopId, shopMerchantEditDTO.getShopId()).one();
         if (shopMerchant == null) {
             shopMerchant = new ShopMerchant();
+            shopMerchant.setShopId(shopMerchantEditDTO.getShopId());
             BeanUtil.copyProperties(shopMerchantEditDTO, shopMerchant);
             return save(shopMerchant);
         }
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("暂未开通支付");
         }
     }