diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/MerchantRegister.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/MerchantRegister.java
index 127f9880..bf89ca66 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/MerchantRegister.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/MerchantRegister.java
@@ -41,7 +41,7 @@ public class MerchantRegister implements Serializable {
     /**
      * 店铺id
      */
-    private String shopId;
+    private Long shopId;
 
     /**
      * 激活码金额
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
index 099172b9..e4c0b197 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
@@ -81,6 +81,9 @@ public class ShopInfoServiceImpl extends ServiceImpl<ShopInfoMapper, ShopInfo> i
             throw new CzgException("激活码已使用");
         }
         shopInfo.setExpireTime(DateUtil.offsetMonth(DateUtil.date(), merchantRegister.getPeriodMonth()).toLocalDateTime());
+        merchantRegister.setStatus(1);
+        merchantRegister.setShopId(shopInfo.getId());
+        merchantRegisterService.updateById(merchantRegister);
     }
 
     @Override
@@ -100,8 +103,9 @@ public class ShopInfoServiceImpl extends ServiceImpl<ShopInfoMapper, ShopInfo> i
         //设置激活码
         shopInfo.setStatus(1);
         shopInfo.setProfiles("release");
+        save(shopInfo);
         activateShop(shopInfo, shopInfoAddDTO.getActivateCode());
-        return save(shopInfo);
+        return updateById(shopInfo);
     }
 
     @Override