B端 部分接口

coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerBlackListDTO.java

@@ -0,0 +1,31 @@
+package com.cool.store.dto.partner;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author suzhuhong
+ * @Date 2023/6/13 10:26
+ * @Version 1.0
+ */
+@Data
+public class PartnerBlackListDTO {
+
+    private Long lineId;
+
+    private String partnerId;
+
+    private String mobile;
+
+    private String partnerUserName;
+
+    private Date createTime;
+
+    private String closeUserId;
+
+    private Date closeTime;
+
+    private String joinBlackReason;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java

@@ -71,4 +71,10 @@ public class HyPartnerLineInfoDO implements Serializable {
 
     @ApiModelProperty("结束跟进人员ID")
     private String closeUserId;
+
+    @ApiModelProperty("加入黑名单原因")
+    private String joinBlackReason;
+
+    @ApiModelProperty("移除黑名单原因")
+    private String removeBlackReason;
 }

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

@@ -14,7 +14,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel
-public class LineRequest {
+public class LineRequest extends PageInfoRequest{
 
 
     @ApiModelProperty("关键字")

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

@@ -18,15 +18,6 @@ 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;
 
@@ -54,14 +45,8 @@ public class BlackListVO {
     @ApiModelProperty("结束人员手机号")
     private String closeUserPhone;
 
-    @ApiModelProperty("结束人员手机号归属地")
-    private String closeUserPhoneAddress;
-
-
-
-
-
-
+    @ApiModelProperty("加入黑名单原因")
+    private String joinBlackReason;
 
 
 }

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

@@ -19,7 +19,7 @@ public class IntentAreaSettingVO {
 
     private String zoneName;
 
-    private List<orgVO> orgVOS;
+    private List<OrgVO> orgVOS;
 
     private Date updateTime;
 

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

@@ -0,0 +1,22 @@
+package com.cool.store.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2023/5/31 14:48
+ * @Version 1.0
+ */
+@Data
+@ApiModel
+public class orgVO {
+
+    @ApiModelProperty("id")
+    private Long id;
+    @ApiModelProperty("组织机构名称")
+    private String name;
+
+
+}

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

@@ -0,0 +1,33 @@
+package com.cool.store.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2023/6/13 15:27
+ * @Version 1.0
+ */
+@Data
+public class ZoneVO {
+
+    private Long id;
+
+    private String zoneName;
+
+    private String updateTime;
+
+    private String updateUserId;
+
+    private String updateUserName;
+
+    private List<OrgVO> orgVos;
+
+    private List<OpenAreaVO> openAreaVOS;
+
+
+
+
+
+}

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

@@ -11,7 +11,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel
-public class orgVO {
+public class OrgVO {
 
     @ApiModelProperty("id")
     private Long id;