From f6953a363d9f2f14d3d61561d6e07bfbb0902996 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Sat, 12 Oct 2024 19:35:36 +0800
Subject: [PATCH 1/4] fix

---
 .../main/resources/mapper/ShopInfoMapper.xml  | 61 ++++++++++---------
 .../resources/mapper/ShopStageInfoMapper.xml  | 19 +++---
 .../impl/PlatformBuildServiceImpl.java        |  1 +
 3 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
index 517c131eb..a573f66ca 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
@@ -175,35 +175,40 @@
       </if>
     </select>
     <select id="platformBuildList" resultType="com.cool.store.response.PlatformBuildListResponse">
-      select
-      xsi.id as shopId,
-      xsi.shop_name as shopName,
-      xsi.shop_code as shopCode,
-      xsi.region_id as regionId,
-      xli.mobile as mobile,
-      xli.username as partnerName
-      from xfsg_shop_info xsi
-      left join xfsg_line_info xli on xsi.line_id = xli.id
-      where
-      xsi.region_id in
-      <foreach collection="list" open="(" separator="," close=")" index="index" item="item">
-        #{item}
-      </foreach>
-      <if test="request.shopKeyword != null and request.shopKeyword != ''">
-        and (xsi.shop_name like concat("%",#{request.shopKeyword},"%") or xsi.shop_code like
-        concat("%",#{request.shopKeyword},"%"))
-      </if>
-      <if test="request.partnerKeyword != null and request.partnerKeyword != ''">
-        and (xli.mobile like concat("%",#{request.partnerKeyword},"%") or xli.username like
-        concat("%",#{request.partnerKeyword},"%"))
-      </if>
-      <if test="request.regionIds != null and request.regionIds.size()>0">
-        and xsi.region_id in
-        <foreach collection="request.regionIds" open="(" separator="," close=")" index="index" item="item">
-          #{item}
+        select
+      DISTINCT
+        xsi.id as shopId,
+        xsi.shop_name as shopName,
+        xsi.shop_code as shopCode,
+        xsi.region_id as regionId,
+        xli.mobile as mobile,
+        xli.username as partnerName
+        from xfsg_shop_info xsi
+        left join xfsg_line_info xli on xsi.line_id = xli.id
+        left join xfsg_shop_stage_info xssi on xssi.shop_id = xsi.id
+        where
+        xssi.shop_stage = 3
+        and xssi.shop_sub_stage_status != -100
+        and
+        xsi.region_id in
+        <foreach collection="list" open="(" separator="," close=")" index="index" item="item">
+            #{item}
         </foreach>
-      </if>
-      order by xsi.create_time
+        <if test="request.shopKeyword != null and request.shopKeyword != ''">
+            and (xsi.shop_name like concat("%",#{request.shopKeyword},"%") or xsi.shop_code like
+            concat("%",#{request.shopKeyword},"%"))
+        </if>
+        <if test="request.partnerKeyword != null and request.partnerKeyword != ''">
+            and (xli.mobile like concat("%",#{request.partnerKeyword},"%") or xli.username like
+            concat("%",#{request.partnerKeyword},"%"))
+        </if>
+        <if test="request.regionIds != null and request.regionIds.size()>0">
+            and xsi.region_id in
+            <foreach collection="request.regionIds" open="(" separator="," close=")" index="index" item="item">
+                #{item}
+            </foreach>
+        </if>
+        order by xsi.create_time
     </select>
 
   <select id="selectByIdOrSelectAll"  resultMap="BaseResultMap">
diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
index b797f2d6b..dffcfc088 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
@@ -328,15 +328,16 @@
     group by shop_id
   </select>
   <select id="getPlatformBuildStage" resultType="com.cool.store.dto.PlatformBuildStageDTO">
-      select shop_id as shopId,
-      shop_sub_stage as shopSubStage,
-      shop_sub_stage_status as shopSubStageStatus
-      from xfsg_shop_stage_info
-      where shop_stage = 3
-      and shop_id in
-      <foreach collection="shopIds" item="shopId" index="index" open="(" separator="," close=")">
-          #{shopId}
-      </foreach>
+    select shop_id as shopId,
+    shop_sub_stage as shopSubStage,
+    shop_sub_stage_status as shopSubStageStatus
+    from xfsg_shop_stage_info
+    where shop_stage = 3
+    and shop_sub_stage_status != -100
+    and shop_id in
+    <foreach collection="shopIds" item="shopId" index="index" open="(" separator="," close=")">
+      #{shopId}
+    </foreach>
 
   </select>
   <select id="getSubStages" resultType="com.cool.store.entity.ShopStageInfoDO">
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java
index 76ce242f4..b7a97eaf4 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java
@@ -38,6 +38,7 @@ import springfox.documentation.swagger2.mappers.LicenseMapper;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static com.cool.store.enums.point.ShopSubStageStatusEnum.*;

From 363c95463cb14b1081d0b8359630012c6f3e843e Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Sat, 12 Oct 2024 19:38:04 +0800
Subject: [PATCH 2/4] fix

---
 .../src/main/resources/mapper/ShopInfoMapper.xml                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
index a573f66ca..da1169e8e 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
@@ -208,7 +208,7 @@
                 #{item}
             </foreach>
         </if>
-        order by xsi.create_time
+        order by xsi.create_time desc
     </select>
 
   <select id="selectByIdOrSelectAll"  resultMap="BaseResultMap">

From bdd4c536535d95d58fb78307e6388ad225e5d988 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Sat, 12 Oct 2024 19:44:51 +0800
Subject: [PATCH 3/4] fix desk

---
 .../cool/store/service/impl/DeskServiceImpl.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
index adbaded8b..a1616b89c 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
@@ -489,7 +489,9 @@ public class DeskServiceImpl implements DeskService {
         Map<Long, List<DeskStageDTO>> deskStageMap = new HashMap<>();
         if (ShopSubStageEnum.SHOP_STAGE_16.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())
                 || ShopSubStageEnum.SHOP_STAGE_17.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())
-                || ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())) {
+                || ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())
+                || ShopSubStageEnum.SHOP_STAGE_23.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())
+                || ShopSubStageEnum.SHOP_STAGE_24.getShopSubStage().equals(shopSubStageEnum.getShopSubStage()) ){
             List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage());
             doThing(deskStageMap, subStageList);
         } else if (ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())) {
@@ -540,13 +542,11 @@ public class DeskServiceImpl implements DeskService {
             if (ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())) {
                 preparationCommonPendingVO.setSubmitTime(deskStageMap.get(x.getShopId()).get(0).getActualCompleteTime());
             }
-            if (ShopSubStageEnum.SHOP_STAGE_16.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())) {
-                preparationCommonPendingVO.setSubmitTime(deskStageMap.get(x.getShopId()).get(0).getActualCompleteTime());
-            }
-            if (ShopSubStageEnum.SHOP_STAGE_17.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())) {
-                preparationCommonPendingVO.setSubmitTime(deskStageMap.get(x.getShopId()).get(0).getActualCompleteTime());
-            }
-            if (ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())) {
+            if (ShopSubStageEnum.SHOP_STAGE_16.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())
+                    || ShopSubStageEnum.SHOP_STAGE_17.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())
+                    || ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())
+                    || ShopSubStageEnum.SHOP_STAGE_23.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())
+                    || ShopSubStageEnum.SHOP_STAGE_24.getShopSubStage().equals(shopSubStageEnum.getShopSubStage()) ){
                 preparationCommonPendingVO.setSubmitTime(deskStageMap.get(x.getShopId()).get(0).getActualCompleteTime());
             }
             if (ShopSubStageEnum.SHOP_STAGE_11.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())) {

From d7b9bb36d5740e9c54e475eebfe35f33837d60d2 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Sat, 12 Oct 2024 20:03:10 +0800
Subject: [PATCH 4/4] fix desk

---
 .../src/main/java/com/cool/store/service/DeskService.java  | 2 ++
 .../java/com/cool/store/service/impl/DeskServiceImpl.java  | 6 ++++++
 .../com/cool/store/controller/webb/DeskController.java     | 7 +++++++
 3 files changed, 15 insertions(+)

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java
index 8e690c5ef..fd3b93db8 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java
@@ -150,6 +150,8 @@ public interface DeskService {
      * @return
      */
     PageInfo<PreparationCommonPendingVO> firstOrderListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
+
+    PageInfo<PreparationCommonPendingVO> trainListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
     /**
      *  信发系统
      */
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
index a1616b89c..389446e4c 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
@@ -371,6 +371,12 @@ public class DeskServiceImpl implements DeskService {
         return null;
     }
 
+    @Override
+    public PageInfo<PreparationCommonPendingVO> trainListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
+      return   commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_5,
+                Collections.singletonList(SHOP_SUB_STAGE_STATUS_50.getShopSubStageStatus()), Boolean.TRUE);
+    }
+
     @Override
     public PageInfo<PreparationCommonPendingVO> xinFaListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
         return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_23,
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java
index 4524dd9c0..a2b017169 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java
@@ -141,6 +141,13 @@ public class DeskController {
         return ResponseResult.success(deskService.firstOrderListPendingList(pageNumber,pageSize,userInfo));
     }
 
+    @ApiOperation("待处理-培训登记")
+    @GetMapping("/trainListPendingList")
+    public ResponseResult<PageInfo<PreparationCommonPendingVO>> trainListPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
+                                                                                     @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
+        LoginUserInfo userInfo = CurrentUserHolder.getUser();
+        return ResponseResult.success(deskService.trainListPendingList(pageNumber,pageSize,userInfo));
+    }
     @ApiOperation("待处理-信发系统")
     @GetMapping("/xinFaListPendingList")
     public ResponseResult<PageInfo<PreparationCommonPendingVO>> xinFaListPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,