增加接口获取店铺某阶段状态

coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java

@@ -132,4 +132,6 @@ public interface ShopService {
      * @return
      */
     List<UserDTO> getSubStageHandle(Long shopId,Integer subStage);
+
+    ShopStageInfoVO getShopStageStatus(Long shopId, Integer subStage);
 }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java

@@ -781,7 +781,7 @@ public class ShopServiceImpl implements ShopService {
             case SHOP_SUB_STAGE_STATUS_85:
                 return getUsersByRolesAndRegion(Arrays.asList(REGION_OFFICE, JOIN_OFFICE), shopInfo.getRegionId());
 
-            case SHOP_SUB_STAGE_STATUS_72:
+           // case SHOP_SUB_STAGE_STATUS_72:
             case SHOP_SUB_STAGE_STATUS_83:
                 return getUsersByRolesAndRegion(Arrays.asList(REGION_OFFICE, BRANCH_OFFICE), shopInfo.getRegionId());
 
@@ -860,6 +860,18 @@ public class ShopServiceImpl implements ShopService {
         }
     }
 
+    @Override
+    public ShopStageInfoVO getShopStageStatus(Long shopId, Integer subStage) {
+        if(shopId == null||  subStage == null ){
+            throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
+        }
+        ShopStageInfoDO stage = shopStageInfoDAO.getByShopIdAndSubStage(shopId, subStage);
+        if (stage!=null){
+            return new ShopStageInfoVO(stage.getShopStage(), stage.getShopSubStage(), stage.getShopSubStageStatus(),stage.getIsTerminated());
+        }
+        return null;
+    }
+
     /**
      * 获取招商经理信息
      * @param

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java

@@ -76,7 +76,8 @@ public class DeskController {
     @ApiOperation("待处理-支付加盟费保证金")
     @GetMapping("/payFranchiseFeesPendingList")
     public ResponseResult<PageInfo<PreparationCommonPendingVO>> payFranchiseFeesPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
-                                                                                            @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
+                                                                                            @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize ,
+                                                                                            @RequestParam(value = "keyword") String keyword) {
         LoginUserInfo userInfo = CurrentUserHolder.getUser();
         return ResponseResult.success(deskService.payFranchiseFeesPendingList(pageNumber, pageSize, userInfo,keyword));
     }

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java

@@ -138,4 +138,10 @@ public class MiniShopController {
         return ResponseResult.success(shopService.getFranchiseBrandName(shopId));
     }
 
+    @ApiOperation("获取店铺某阶段状态")
+    @GetMapping("/getShopStageStatus")
+    public ResponseResult<ShopStageInfoVO> getShopStageStatus(@RequestParam("shopId")Long shopId, @RequestParam("subStage")Integer subStage) {
+        return ResponseResult.success(shopService.getShopStageStatus(shopId, subStage));
+    }
+
 }