From 9cfe4bee0c4ad5692c8b3cbd2da3e9af9cc1c6e4 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Tue, 25 Mar 2025 00:26:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E9=A9=BB=E4=BF=A1=E6=81=AF=E8=BD=AC?=
 =?UTF-8?q?=E6=88=90=E5=BA=97=E9=93=BA=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EsignContractServiceImpl.java        | 21 +++++++++++++++++++
 .../impl/ShopStoreBaseServiceImpl.java        |  1 -
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignContractServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignContractServiceImpl.java
index f2569e49..196d7109 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignContractServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignContractServiceImpl.java
@@ -34,6 +34,7 @@ import com.suisung.mall.shop.esign.utils.enums.EsignRequestType;
 import com.suisung.mall.shop.esign.utils.exception.EsignDemoException;
 import com.suisung.mall.shop.page.service.OssService;
 import com.suisung.mall.shop.store.service.ShopMerchEntryService;
+import com.suisung.mall.shop.store.service.ShopStoreBaseService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -88,6 +89,9 @@ public class EsignContractServiceImpl extends BaseServiceImpl<EsignContractMappe
     @Resource
     private EsignPlatformInfoService esignPlatformInfoService;
 
+    @Resource
+    private ShopStoreBaseService shopStoreBaseService;
+
     @Resource
     private OssService ossService;
 
@@ -284,6 +288,23 @@ public class EsignContractServiceImpl extends BaseServiceImpl<EsignContractMappe
             // 更新合同流程状态和文件地址
             boolean success = updateContractFlowStatusAndFileUrlBySignFlowId(signFlowId, CommonConstant.CONTRACT_SIGN_STA_FINISH, downloadUrl);
             if (success && StrUtil.isNotBlank(downloadUrl)) {
+
+                // 新建一个正式的已审核通过的店铺
+                taskService.executeTask(() -> {
+                    try {
+                        Pair<Integer, String> retPair = shopStoreBaseService.merchEntryInfo2StoreInfo(esignContract.getMch_mobile());
+                        if (retPair.getFirst() > 0) {
+                            // 更改合同记录表的店铺id
+                            UpdateWrapper<EsignContract> updateWrapper = new UpdateWrapper<>();
+                            updateWrapper.eq("sign_flow_id", signFlowId);
+                            updateWrapper.set("store_id", retPair.getSecond());
+                            update(updateWrapper);
+                        }
+                    } catch (Exception e) {
+                        log.error("店铺创建失败:", e);
+                    }
+                });
+
                 return new ResponseEntity<>(new JSONObject().put("code", 200).put("msg", "success").toString(), HttpStatus.OK);
             }
         } else if (action.equals("SIGN_MISSON_COMPLETE") && ObjectUtil.isNotEmpty(signResult)) {// 签署方-签署结果（含拒签）通知
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
index 0c577005..d22b22cb 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
@@ -3017,7 +3017,6 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
         // 保存后店铺Id
         storeId = shopStoreBase.getStore_id();
 
-
         // shop_store_info
         ShopStoreInfo shopStoreInfo = new ShopStoreInfo();
         shopStoreInfo.setStore_id(storeId);