接口拆分

coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author suzhuhong
  * @Date 2023/5/30 15:14
@@ -38,7 +40,7 @@ public class PartnerIntentInfoRequest {
     private String moneySource;
 
     @ApiModelProperty("资金证明")
-    private String moneyProve;
+    private List<String> moneyProve;
 
     @ApiModelProperty("学历")
     private String education;

coolstore-partner-model/src/main/java/com/cool/store/request/StageCountRequest.java

@@ -16,7 +16,4 @@ public class StageCountRequest extends PageInfoRequest {
     @ApiModelProperty("类型  待处理-Pending   待跟进-follow")
     private String type;
 
-    @ApiModelProperty("流程阶段")
-    private String workflowStage;
-
 }

coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java

@@ -0,0 +1,67 @@
+package com.cool.store.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author suzhuhong
+ * @Date 2023/6/2 16:06
+ * @Version 1.0
+ */
+@Data
+@ApiModel
+public class BlackListVO {
+
+    @ApiModelProperty("线索ID")
+    private Long id;
+
+    @ApiModelProperty("hy_partner_user_info.partner_id")
+    private String partnerId;
+
+    @ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同")
+    private String workflowStage;
+
+    @ApiModelProperty("流程子状态")
+    private String workflowStatus;
+
+    @ApiModelProperty("加盟商用户ID")
+    private String partnerUserId;
+
+    @ApiModelProperty("加盟商用户名称")
+    private String partnerUserName;
+
+    @ApiModelProperty("加盟商用户手机号")
+    private String partnerUserPhone;
+
+    @ApiModelProperty("手机号归属地")
+    private String phoneAddress;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("操作时间")
+    private Date closeTime;
+
+    @ApiModelProperty("操作人ID")
+    private String closeUserId;
+
+    @ApiModelProperty("操作人名称")
+    private String closeUserName;
+
+    @ApiModelProperty("结束人员手机号")
+    private String closeUserPhone;
+
+    @ApiModelProperty("结束人员手机号归属地")
+    private String closeUserPhoneAddress;
+
+
+
+
+
+
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentApplyInfoVO.java

@@ -19,6 +19,9 @@ public class PartnerIntentApplyInfoVO {
     @ApiModelProperty("")
     private Long id;
 
+    @ApiModelProperty("加盟商用户名称")
+    private String partnerUserName;
+
     @ApiModelProperty("hy_partner_user_info.partner_id")
     private String partnerId;
 

coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author suzhuhong
@@ -46,7 +47,7 @@ public class PartnerIntentInfoVO {
     private String moneySource;
 
     @ApiModelProperty("资金证明")
-    private String moneyProve;
+    private List<String> moneyProve;
 
     @ApiModelProperty("学历")
     private String education;

coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java

@@ -19,6 +19,9 @@ public class PartnerInterviewInfoVO {
     @ApiModelProperty("")
     private Long id;
 
+    @ApiModelProperty("加盟商用户名称")
+    private String partnerUserName;
+
     @ApiModelProperty("预约状态 0 待预约;1待面试;2已开始;3待审核;4审批中;5审批通过;6拒绝")
     private Integer status;
 
@@ -28,7 +31,7 @@ public class PartnerInterviewInfoVO {
     @ApiModelProperty("hy_partner_interview_arrangement.id")
     private Long interviewArrangementId;
 
-    @ApiModelProperty("hy_partner_user_info.partner_id")
+    @ApiModelProperty("加盟商用户ID")
     private String partnerId;
 
     @ApiModelProperty("截止时间")

coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineDetailVO.java

@@ -47,19 +47,6 @@ public class PartnerLineDetailVO {
     @ApiModelProperty("用户画像")
     private String userPortrait;
 
-    @ApiModelProperty("意向审核信息")
-    private PartnerIntentApplyInfoVO partnerIntentApplyInfoVO;
-
-
-    @ApiModelProperty("预约面试、合格资格面试 信息")
-    private PartnerInterviewInfoVO partnerInterviewInfoVO;
-
-    @ApiModelProperty("邀请门店基本信息")
-    private InviteCodeDetailVO inviteCodeDetailVO;
-
-    @ApiModelProperty("跟进历史")
-    List<LineFollowHistoryVO> lineFollowHistoryVOList;
-
 
 
 

coolstore-partner-model/src/main/java/com/cool/store/vo/PublicSeaLineListVo.java

@@ -13,7 +13,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel
-public class PartnerStageInfoVO {
+public class PublicSeaLineListVo {
 
 
     @ApiModelProperty("线索ID")
@@ -40,7 +40,7 @@ public class PartnerStageInfoVO {
     @ApiModelProperty("手机号归属地")
     private String phoneAddress;
     @ApiModelProperty("创建时间")
-    private String createTime;
+    private Date createTime;
 
     @ApiModelProperty("面试开始时间")
     private Date partnerInterviewStartTime;
@@ -60,10 +60,4 @@ public class PartnerStageInfoVO {
     @ApiModelProperty("跟进次数")
     private Integer followCount;
 
-    @ApiModelProperty("意向审核信息")
-    private PartnerIntentApplyInfoVO partnerIntentApplyInfoVO;
-
-    @ApiModelProperty("预约面试、合格资格面试 信息")
-    private PartnerInterviewInfoVO partnerInterviewInfoVO;
-
 }

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

@@ -32,32 +32,88 @@ public class DeskController {
     }
 
 
-    @PostMapping(path = "/queryStageCount")
+    @GetMapping(path = "/queryStageCount")
     @ApiOperation("招商经理视角====各阶段待处理待跟进数量")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型  待处理-Pending   待跟进-follow", required = false),
+    })
     public ResponseResult<StageCountVO> queryStageCount(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
-                                                        @RequestBody StageCountRequest stageCountRequest){
+                                                        @RequestParam(value = "type",required = false)Integer type){
 
         return ResponseResult.success();
     }
 
 
-    @PostMapping(path = "/queryStageList")
+    @PostMapping(path = "/queryIntentApplyList")
-    @ApiOperation("招商经理视角====各阶段待数据列表")
+    @ApiOperation("招商经理视角===意向申请审核列表")
-    public ResponseResult<PageInfo<PartnerStageInfoVO>> queryStageList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
+    @ApiImplicitParams({
-                                                                       @RequestBody StageCountRequest stageCountRequest){
+            @ApiImplicitParam(name = "type", value = "类型  待处理-Pending   待跟进-follow", required = false),
+    })
+    public ResponseResult<PageInfo<PartnerIntentApplyInfoVO>> queryIntentApplyList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
+                                                                                   @RequestParam(value = "type",required = false)Integer type){
+
+        return ResponseResult.success();
+    }
+
+
+    @PostMapping(path = "/querySubscribeInterviewTimeList")
+    @ApiOperation("招商经理视角===预约面试时间/合格资格面试 列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型  待处理-Pending   待跟进-follow", required = false),
+    })
+    public ResponseResult<PageInfo<PartnerInterviewInfoVO>> querySubscribeInterviewTimeList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
+                                                                                            @RequestParam(value = "type",required = false)Integer type){
 
         return ResponseResult.success();
     }
 
 
     @GetMapping(path = "/getPartnerLineDetail")
-    @ApiOperation("查询加盟商线索详情 包括冷静期是否首次登录")
+    @ApiOperation("查询加盟商线索详情 线索信息与基本信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
     })
     public ResponseResult<PartnerLineDetailVO> getPartnerLineDetail(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
                                                                   @RequestParam(value = "lineId",required = false)Long lineId){
 
+        return ResponseResult.success();
+    }
+
+
+    @GetMapping(path = "/getPartnerIntentInfo")
+    @ApiOperation("查询加盟商线索详情 意向信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
+    })
+    public ResponseResult<PartnerIntentApplyInfoVO> getPartnerIntentInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
+                                                                    @RequestParam(value = "lineId",required = false)Long lineId){
+
+
+        return ResponseResult.success();
+    }
+
+
+    @GetMapping(path = "/getPartnerIntentInfo")
+    @ApiOperation("查询加盟商线索详情 邀请码信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "partnerId", value = "partnerId", required = false),
+    })
+    public ResponseResult<InviteCodeDetailVO> getInviteCodeDetail(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
+                                                                  @RequestParam(value = "partnerId",required = false)Long partnerId){
+
+
+        return ResponseResult.success();
+    }
+
+
+    @GetMapping(path = "/getFollowHistory")
+    @ApiOperation("查询加盟商线索详情 跟进历史")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "partnerId", value = "partnerId", required = false),
+    })
+    public ResponseResult<List<LineFollowHistoryVO>> getFollowHistory(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
+                                                                  @RequestParam(value = "partnerId",required = false)Long partnerId){
+
 
         return ResponseResult.success();
     }
@@ -80,7 +136,7 @@ public class DeskController {
 
     @PostMapping(path = "/allocationInvestmentManager")
     @ApiOperation("分配招商经理/转让招商经理")
-    public ResponseResult<PageInfo<PartnerStageInfoVO>> allocationInvestmentManager(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
+    public ResponseResult<Boolean> allocationInvestmentManager(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
                                                                                     @RequestBody AllocationInvestmentManagerRequest allocationInvestmentManagerRequest){
 
         return ResponseResult.success();
@@ -90,7 +146,7 @@ public class DeskController {
 
     @PostMapping(path = "/queryPublicSeqLineList")
     @ApiOperation("公海列表")
-    public ResponseResult<PageInfo<PartnerStageInfoVO>> queryPublicSeaLineList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
+    public ResponseResult<PageInfo<PublicSeaLineListVo>> queryPublicSeaLineList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
                                                                                @RequestBody LineRequest LineRequest){
 
         return ResponseResult.success();
@@ -111,7 +167,7 @@ public class DeskController {
 
     @PostMapping(path = "/queryBlackList")
     @ApiOperation("黑名单列表")
-    public ResponseResult<PageInfo<PartnerStageInfoVO>> queryBlackList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
+    public ResponseResult<PageInfo<BlackListVO>> queryBlackList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
                                                                 @RequestBody LineRequest LineRequest){
 
         return ResponseResult.success();
@@ -138,7 +194,7 @@ public class DeskController {
 
 
     @PostMapping(path = "/closeOrPassFollow")
-    @ApiOperation("结束跟进/通过流程")
+    @ApiOperation("意向申请审核 结束跟进/通过流程")
     public ResponseResult<Boolean> closeFollow(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
                                                  @RequestBody CloseFollowRequest closeFollowRequest){
 

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

@@ -123,7 +123,7 @@ public class PartnerController {
 
 
 
-    @GetMapping(path = "/getPartnerLinBaseInfo")
+    @GetMapping(path = "/getPartnerLineBaseInfo")
     @ApiOperation("查询加盟商线索详情(适用全部流程) 包括冷静期是否首次登录")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "partnerId", value = "C端用户基本信息ID", required = false),