From 06e37e0e8959f5fb117a3cadf7b40b2dddf9c38a Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Mon, 13 Jan 2025 14:53:18 +0800
Subject: [PATCH] fix

---
 .../main/java/com/cool/store/dao/ShopInfoDAO.java |  4 ++--
 .../com/cool/store/mapper/ShopInfoMapper.java     |  2 +-
 .../src/main/resources/mapper/ShopInfoMapper.xml  |  6 ++++++
 .../com/cool/store/request/BranchShopRequest.java |  6 +-----
 .../cool/store/response/BranchShopResponse.java   |  8 ++++----
 .../store/service/impl/ExportServiceImpl.java     |  2 ++
 .../cool/store/service/impl/ShopServiceImpl.java  |  9 +++++++--
 .../store/controller/webb/PCShopController.java   |  7 +------
 .../controller/webb/PreparationController.java    | 15 ++++++++++-----
 9 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java
index e968c92f7..e9a069b25 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java
@@ -76,11 +76,11 @@ public class ShopInfoDAO {
         return shopInfoMapper.getShopList(lineId);
     }
 
-    public List<ShopInfoDO> getShopListByRegion(Long lineId,List<Long> regionIdList){
+    public List<ShopInfoDO> getShopListByRegion(Long lineId,List<Long> regionIdList,String userId){
         if(Objects.isNull(lineId)){
             return new ArrayList<>();
         }
-        return shopInfoMapper.getShopListByRegion(lineId,regionIdList);
+        return shopInfoMapper.getShopListByRegion(lineId,regionIdList,userId);
     }
 
     /**
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java
index 8f2fd7cdb..770e2393f 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java
@@ -39,7 +39,7 @@ public interface ShopInfoMapper extends Mapper<ShopInfoDO> {
      */
     List<ShopInfoDO> getShopList(@Param("lineId") Long lineId);
 
-    List<ShopInfoDO> getShopListByRegion(@Param("lineId") Long lineId,@Param("list") List<Long> regions);
+    List<ShopInfoDO> getShopListByRegion(@Param("lineId") Long lineId,@Param("list") List<Long> regions,@Param("userId") String userId);
 
     /**
      * 店铺信息
diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
index bd6d1ef73..c66f185a9 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
@@ -330,6 +330,12 @@
             #{item}
             </foreach>
         </if>
+        <if test="userId ==null or userId ==''">
+           and shop_status in (0,1)
+        </if>
+        <if test="userId !=null and userId !=''">
+          and  shop_status in (0,1,2)
+        </if>
     </select>
 
   <select id="getShopPointListByDevelopmentManager" resultType="com.cool.store.dto.point.ShopPointDTO">
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java
index 289277f48..f0956a879 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java
@@ -14,11 +14,7 @@ import java.util.List;
  * @注释:
  */
 @Data
-public class BranchShopRequest  {
-    //页码
-    private Integer pageNum=1;
-    //分页大小
-    private Integer pageSize=10;
+public class BranchShopRequest  extends PageBasicInfo{
     @ApiModelProperty("加盟商姓名或手机号")
     private String partnerKeyword;
     @ApiModelProperty("门店名称/编号")
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/BranchShopResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/BranchShopResponse.java
index 318e60689..6eebc942e 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/response/BranchShopResponse.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/response/BranchShopResponse.java
@@ -39,7 +39,7 @@ public class BranchShopResponse {
     @ApiModelProperty("完成项")
     private Integer completionColumn;
     @ApiModelProperty("开店时长")
-    private String openTime;
+    private String days;
     @ApiModelProperty("督导/招商经理")
     private String investmentManagerName;
     @ApiModelProperty("状态")
@@ -49,15 +49,15 @@ public class BranchShopResponse {
     @ApiModelProperty("开业活动完成时间")
     private Date openingActivityEndTime;
 
-    public void setOpenTime() {
+    public void setDays() {
         if (this.openingActivityEndTime==null){
             long between = ChronoUnit.SECONDS.between(this.createTime.toInstant(), new Date().toInstant());
             double days = (double) between / (24*60*60);
-            this.openTime=String.format("%.1f", days);
+            this.days=String.format("%.1f", days);
         }else{
             long between = ChronoUnit.SECONDS.between(this.createTime.toInstant(), this.openingActivityEndTime.toInstant());
             double days = (double) between / (24*60*60);
-            this.openTime = String.format("%.1f", days);
+            this.days = String.format("%.1f", days);
         }
 
     }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java
index 779697bc7..82a7b900b 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java
@@ -73,6 +73,7 @@ public class ExportServiceImpl implements ExportService {
     private ShopService shopService;
 
 
+    //原先进度管理接口废弃，使用branchShopList
     @Override
     public Integer preparationList(PreparationRequest request, LoginUserInfo loginUserInfo) {
         if (!sysRoleService.checkIsAdmin(request.getCurUserId())) {
@@ -112,6 +113,7 @@ public class ExportServiceImpl implements ExportService {
     @Override
     public Long branchShopList(BranchShopRequest request, LoginUserInfo user) {
         request.setPageSize(CommonConstants.MAX_EXPORT_SIZE + 100);
+        request.setPageNum(CommonConstants.ONE);
         PageInfo<BranchShopResponse> branchShopList = shopService.getBranchShopList(request, user.getUserId());
         long total = branchShopList.getTotal();
         List<BranchShopResponse> exportList = new ArrayList<>();
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
index 6b4168dd7..77cce3b7b 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
@@ -121,6 +121,11 @@ public class ShopServiceImpl implements ShopService {
         return result;
     }
 
+    /**
+     * @Auther: wangshuo
+     * @Date: 2025/1/13
+     * @description: 当userId为空时，表示为mini，查询的门店不包括结束跟进的，否则为mini，查询的门店包括结束跟进的
+     */
     @Override
     public List<MiniShopPageVO> getShopList(Long lineId, String userId) {
         List<Long> authRegions = new ArrayList<>();
@@ -129,7 +134,7 @@ public class ShopServiceImpl implements ShopService {
                 authRegions.add(Long.valueOf(region));
             }
         }
-        List<ShopInfoDO> shopList = shopInfoDAO.getShopListByRegion(lineId, authRegions);
+        List<ShopInfoDO> shopList = shopInfoDAO.getShopListByRegion(lineId, authRegions,userId);
         List<Long> shopIds = shopList.stream().map(ShopInfoDO::getId).collect(Collectors.toList());
         List<Long> wantShopAreaIds = shopList.stream().map(ShopInfoDO::getWantShopAreaId).collect(Collectors.toList());
         Map<Long, String> wantRegionMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaIds);
@@ -381,7 +386,7 @@ public class ShopServiceImpl implements ShopService {
             response.setInvestmentManagerName(userInfoMap.getOrDefault(dto.getInvestmentManager(), new EnterpriseUserDO()).getName());
             response.setShopStatus(ShopStatusEnum.getDesc(dto.getShopStatus()));
             response.setCreateTime(dto.getCreateTime());
-            response.setOpenTime();
+            response.setDays();
             responses.add(response);
         }
 
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java
index aa9f09eef..199695189 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java
@@ -117,12 +117,7 @@ public class PCShopController {
         return ResponseResult.success(transferLogService.getTransferLogPage(pageNum, pageSize, lineId, lineShopType));
     }
 
-    @ApiOperation("开店管理列表")
-    @PostMapping("/getBranchShopList")
-    public ResponseResult<PageInfo<BranchShopResponse>> getBranchShopList(@RequestBody @Validated BranchShopRequest request) {
-        String userId = CurrentUserHolder.getUserId();
-        return ResponseResult.success(shopService.getBranchShopList(request, userId));
-    }
+
 
 
     @ApiOperation("门店结束跟进")
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PreparationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PreparationController.java
index ec3744f74..190ba2815 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PreparationController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PreparationController.java
@@ -1,10 +1,14 @@
 package com.cool.store.controller.webb;
 
 import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.request.BranchShopRequest;
 import com.cool.store.request.PreparationRequest;
 import com.cool.store.request.TrainingExperienceDistributionRequest;
+import com.cool.store.response.BranchShopDetailResponse;
+import com.cool.store.response.BranchShopResponse;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.PreparationService;
+import com.cool.store.service.ShopService;
 import com.cool.store.service.impl.PreparationServiceImpl;
 import com.cool.store.vo.Preparation.PreparationProcessVO;
 import com.cool.store.vo.Preparation.PreparationScheduleDetailVO;
@@ -31,19 +35,20 @@ public class PreparationController {
 
     @Resource
     PreparationService preparationService;
+    @Resource
+    ShopService shopService;
 
     @ApiOperation("进度列表")
     @PostMapping("/list")
-    public ResponseResult<PageInfo<PreparationScheduleVO>> distribution(@RequestBody PreparationRequest request) {
-        request.setCurUserId(CurrentUserHolder.getUserId());
-        return ResponseResult.success(preparationService.getPreparationSchedule(request));
+    public ResponseResult<PageInfo<BranchShopResponse>> distribution(@RequestBody BranchShopRequest request) {
+        return ResponseResult.success(shopService.getBranchShopList(request,CurrentUserHolder.getUserId()));
     }
 
 
     @ApiOperation("筹建详情")
     @GetMapping("/getPreparationDetail")
-    public ResponseResult<PreparationScheduleDetailVO> getPreparationDetail(@RequestParam("shopId")Long shopId) {
-        return ResponseResult.success(preparationService.getPreparationDetail(shopId));
+    public ResponseResult<BranchShopDetailResponse> getPreparationDetail(@RequestParam("shopId")Long shopId) {
+        return ResponseResult.success(shopService.getBranchShopDetail(shopId));
     }
 
     @ApiOperation("筹建进展")