From 4d37951e46b53f87ad14b34dc058499a05b6b2b1 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Fri, 16 May 2025 17:18:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E6=95=B0=E6=95=B0=E6=8D=AE=E4=BA=91?=
 =?UTF-8?q?=E6=B5=81=E6=B0=B4=E8=B4=A6=E5=8F=B7=E5=8A=A0=E5=89=8D=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DataHandlerServerImpl.java   | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java
index 2b8f1326a..0c6342010 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java
@@ -592,7 +592,8 @@ public class DataHandlerServerImpl implements DataHandlerServer {
         List<Long> shopIds = shopInfoList.stream().map(ShopInfoDO::getId).collect(Collectors.toList());
         List<Long> lineIdList = shopInfoList.stream().map(ShopInfoDO::getLineId).collect(Collectors.toList());
         //装修验收数据
-        acceptanceInfoDAO.selectByShopIds(shopIds);
+        List<AcceptanceInfoDO> acceptanceInfoDOList = acceptanceInfoDAO.selectByShopIds(shopIds);
+        Map<Long, AcceptanceInfoDO> acceptanceInfoMap = acceptanceInfoDOList.stream().collect(Collectors.toMap(AcceptanceInfoDO::getShopId, item -> item));
         //手机号
         Map<Long, String> lineMobileMap = lineInfoDAO.getLineMobileMap(lineIdList);
         //铺位列表
@@ -637,10 +638,18 @@ public class DataHandlerServerImpl implements DataHandlerServer {
         //pos系统
         List<PosAndOrderInfoDO> posSysInfoDOList = posAndOrderInfoDAO.selectListByShopIdAndType(shopIds, PosAndOrderEnum.POS.getCode());
         Map<Long, PosAndOrderInfoDO> posSysInfoDOMap = posSysInfoDOList.stream().collect(Collectors.toMap(PosAndOrderInfoDO::getShopId, Function.identity()));
+        //新发系统
+        List<PosAndOrderInfoDO> xfSysDOList = posAndOrderInfoDAO.selectListByShopIdAndType(shopIds, PosAndOrderEnum.XIN_FA_SYS.getCode());
+        Map<Long, PosAndOrderInfoDO> xfSysInfoDOMap = posSysInfoDOList.stream().collect(Collectors.toMap(PosAndOrderInfoDO::getShopId, Function.identity()));
+        //营帐通系统
+        List<PosAndOrderInfoDO> tentPassInfoDOList = posAndOrderInfoDAO.selectListByShopIdAndType(shopIds, PosAndOrderEnum.TENT_PASS.getCode());
+        Map<Long, PosAndOrderInfoDO> tentPassInfoDOMap = posSysInfoDOList.stream().collect(Collectors.toMap(PosAndOrderInfoDO::getShopId, Function.identity()));
         //装修阶段需要变更的shopId
         List<Long> fitmentFhopIdList = new ArrayList<>();
         //建店阶段完成时间
         List<BuildStageDTO> updateBuildStageList = new ArrayList<>();
+        //装修验收表需要初始化的门店
+        List<Long> initFitmentShopIdList = new ArrayList<>();
         for (ImportOaOldShopDataDTO dto : list) {
             if (!check(dto, errorList)) {
                 continue;
@@ -744,9 +753,7 @@ public class DataHandlerServerImpl implements DataHandlerServer {
                 preparationService.selectSiteAndBuildStoreComplete(shopId);
                 preparationService.buildStoreComplete(shopId);
             }
-            if (buildEndTime.before(new Date(1745164800000L))) {
-                fitmentFhopIdList.add(shopId);
-            }
+            fitmentFhopIdList.add(shopId);
             BuildInformationDO buildInformationDO = buildInformationMap.get(shopId);
             if (Objects.isNull(buildInformationDO)) {
                 addBuildList.add(shopId);
@@ -817,6 +824,25 @@ public class DataHandlerServerImpl implements DataHandlerServer {
                 posDO.setCreateTime(new Date());
                 addPosAndOrderInfoList.add(posDO);
             }
+            //xf
+            //订货系统
+            PosAndOrderInfoDO xf = orderSysInfoDOMap.get(shopId);
+            if (StringUtil.isNotBlank(dto.getYlsAccount())) {
+                if (Objects.isNull(order)) {
+                    order = new PosAndOrderInfoDO();
+                    order.setShopId(shopId);
+                    order.setType(PosAndOrderEnum.ORDER.getCode());
+                    order.setRemark("已为您开通订货系统账号和密码，密码已加密，初始密码为888888，可通过加盟小程序修改密码！");
+                    order.setAccount(dto.getYlsAccount().trim());
+                    order.setPassword("888888");
+                    order.setCreateTime(new Date());
+                    addPosAndOrderInfoList.add(order);
+                }
+            }
+            AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoMap.get(shopId);
+            if (Objects.isNull(acceptanceInfoDO)){
+                initFitmentShopIdList.add(shopId);
+            }
         }
         shopInfoDAO.updateShopCity(shopInfoList);
         pointInfoDAO.updateAddress(pointListByIds);