From 82f707ece09a906007f3d760b6bb025896e3bba6 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 22 四月 2026 15:39:36 +0800
Subject: [PATCH] 门店

---
 server/services/src/main/java/com/doumee/service/business/impl/ShopInfoServiceImpl.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/impl/ShopInfoServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/ShopInfoServiceImpl.java
index e9a63ca..cfc176a 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/ShopInfoServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/ShopInfoServiceImpl.java
@@ -239,8 +239,6 @@
     public void applyShop(ShopApplyDTO request) {
         Member member = memberMapper.selectById(request.getMemberId());
 
-        // 1. 鏍¢獙闂ㄥ簵鎵嬫満鍙峰敮涓�鎬э紙shop_info.telephone锛�
-        checkTelephoneUnique(request.getTelephone(), null);
 
         // 2. 鏍规嵁绫诲瀷鏍¢獙闄勪欢
         if (Constants.equalsInteger(request.getCompanyType(), Constants.ZERO)) {
@@ -320,9 +318,12 @@
             existing.setAuditRemark(null);
             existing.setAuditTime(null);
             existing.setAuditUserId(null);
+            existing.setAuditStatus(Constants.ZERO);
             shopInfoMapper.updateById(existing);
             shopId = existing.getId();
         } else {
+            // 1. 鏍¢獙闂ㄥ簵鎵嬫満鍙峰敮涓�鎬э紙shop_info.telephone锛�
+            checkTelephoneUnique(request.getTelephone(), null);
             // 鏂板缓
             ShopInfo shopInfo = new ShopInfo();
             shopInfo.setCompanyType(request.getCompanyType());
@@ -658,6 +659,7 @@
         vo.setCreateTime(shopInfo.getCreateTime());
         vo.setAliAccount(shopInfo.getAliAccount());
         vo.setAliName(shopInfo.getAliName());
+        vo.setDepositAmount(shopInfo.getDepositAmount());
 
         // 鎷兼帴鍥剧墖鍓嶇紑
         String imgPrefix = "";
@@ -1057,12 +1059,13 @@
     }
 
     @Override
-    public ShopLoginVO shopSilentLogin(String openid) {
-        if (StringUtils.isBlank(openid)) {
-            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "openid涓嶈兘涓虹┖");
+    public ShopLoginVO shopSilentLogin(Integer memberId) {
+        Member member = memberMapper.selectById(memberId);
+        if(Objects.isNull(member)||StringUtils.isBlank(member.getOpenid())){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠鐧诲綍浼氬憳韬唤寮傚父,璇疯仈绯荤鐞嗗憳!");
         }
         ShopInfo shop = shopInfoMapper.selectOne(new QueryWrapper<ShopInfo>().lambda()
-                .eq(ShopInfo::getOpenid, openid)
+                .eq(ShopInfo::getOpenid, member.getOpenid())
                 .eq(ShopInfo::getDeleted, Constants.ZERO)
                 .last("limit 1"));
         if (shop == null) {

--
Gitblit v1.9.3