From 2acc40db4dd14c3d27ea1645f2b5833969e5c1cb Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 四月 2026 19:56:33 +0800
Subject: [PATCH] 代码生成

---
 server/services/src/main/java/com/doumee/service/business/impl/ShopInfoServiceImpl.java |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 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 f08ea2e..cd636c8 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)) {
@@ -315,14 +313,17 @@
             existing.setPassword(encryptedPassword);
             existing.setSalt(salt);
             existing.setAliAccount(request.getAliAccount());
-            existing.setAuditStatus(Constants.ZERO);
+            existing.setAliName(request.getAliName());
             existing.setUpdateTime(now);
             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());
@@ -344,8 +345,7 @@
             shopInfo.setPassword(encryptedPassword);
             shopInfo.setSalt(salt);
             shopInfo.setAliAccount(request.getAliAccount());
-            shopInfo.setOpenid(member.getOpenid());
-            shopInfo.setAuditStatus(Constants.ZERO);
+            shopInfo.setAliName(request.getAliName());
             shopInfo.setStatus(Constants.ZERO);
             shopInfo.setDeleted(Constants.ZERO);
             shopInfo.setCreateTime(now);
@@ -552,6 +552,8 @@
         shopInfo.setLegalPersonName(request.getLegalPersonName());
         shopInfo.setLegalPersonPhone(request.getLegalPersonPhone());
         shopInfo.setLegalPersonCard(request.getLegalPersonCard());
+        shopInfo.setAliAccount(request.getAliAccount());
+        shopInfo.setAliName(request.getAliName());
         shopInfo.setUpdateTime(now);
         shopInfoMapper.updateById(shopInfo);
 
@@ -655,6 +657,9 @@
         vo.setPayStatus(shopInfo.getPayStatus());
         vo.setScore(shopInfo.getScore());
         vo.setCreateTime(shopInfo.getCreateTime());
+        vo.setAliAccount(shopInfo.getAliAccount());
+        vo.setAliName(shopInfo.getAliName());
+        vo.setDepositAmount(shopInfo.getDepositAmount());
 
         // 鎷兼帴鍥剧墖鍓嶇紑
         String imgPrefix = "";

--
Gitblit v1.9.3