From 594b5f1f8f7eb7bf7d4caf970ec95f7114f98254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Wed, 26 Jun 2024 20:50:38 +0800
Subject: [PATCH] =?UTF-8?q?bug=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ShopInfoMapper.xml              | 4 ++--
 .../java/com/cool/store/service/impl/LineFlowService.java     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
index 6b5070e6e..6cd2ab5d3 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
@@ -26,9 +26,9 @@
   </sql>
 
   <insert id="batchAddShop" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
-    insert into xfsg_shop_info(region_id, line_id, partner_id, shop_name, shop_num,supervisor_user_id,) values
+    insert into xfsg_shop_info(region_id, line_id, partner_id, shop_name, store_num,supervisor_user_id) values
     <foreach collection="shopInfoList" item="shop" separator=",">
-      (#{shop.regionId}, #{shop.lineId}, #{shop.partnerId}, #{shop.shopName}, #{shop.shopNum},#{shop.supervisorUserId})
+      (#{shop.regionId}, #{shop.lineId}, #{shop.partnerId}, #{shop.shopName}, #{shop.storeNum},#{shop.supervisorUserId})
     </foreach>
   </insert>
 
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineFlowService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineFlowService.java
index 28b7f2640..5f10f94c2 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineFlowService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineFlowService.java
@@ -48,7 +48,7 @@ public abstract class LineFlowService {
         if(!lineInfo.getWorkflowSubStage().equals(request.getWorkflowSubStage())){
             throw new ServiceException(ErrorCodeEnum.WORK_FLOW_STAGE_PASS_ERROR);
         }
-        if (WorkflowSubStageEnum.INTEND.getCode().equals(lineInfo.getWorkflowStage())){
+        if (WorkflowSubStageEnum.INTEND.getCode().equals(lineInfo.getWorkflowSubStage())){
             lineInfo.setRegionId(request.getFightRegion());
         }
         String partnerId = lineInfo.getPartnerId();