Merge branch 'cc_20230520_partner' of http://gitlab.coolcollege.cn/hangzhou/java/coolstore-partner-manage into cc_20230520_partner

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

@@ -0,0 +1,23 @@
+package com.cool.store.dto.buser;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: UserPositionAndUserScopeDTO
+ * @Description: 员工角色&获取线索范围
+ * @date 2023-06-19 16:33
+ */
+@Data
+public class UserPositionAndUserScopeDTO {
+
+    @ApiModelProperty("招商经理用户ids")
+    private List<String> investmentUserIds;
+
+    @ApiModelProperty("开发经理用户ids")
+    private List<String> developmentUserIds;
+
+}

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

@@ -0,0 +1,49 @@
+package com.cool.store.dto.mdm;
+
+import lombok.Data;
+
+
+@Data
+public class CallbackDto {
+//
+//    private Owner owner;
+//
+//    private long modifiedTime;
+//
+//    private Creator creator;
+//
+//    private CreatorDepartment creatorDepartment;
+//
+//    private String authCode;
+//
+//    private Modifier modifier;
+//
+//    private int amtDeposit;
+//
+//    private FraSource fraSource;
+//
+//    private String intendedSignerTel;
+//
+//    private String sequenceNo;
+//
+//    private String sequenceStatus;
+//
+//    private String instanceId;
+//
+//    private OwnerDepartment ownerDepartment;
+//
+//    private SelfObject selfObject;
+//
+//    private String name;
+//
+//    private long createdTime;
+//
+//    private String id;
+//
+//    private long intendedSignDate;
+//
+//    private String intendedSigner;
+//
+//    private String systemsource;
+
+}

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

@@ -33,6 +33,12 @@ public class HyPartnerCertificationInfoDO implements Serializable {
     @ApiModelProperty("合作关系:1总部下属;2小区代直营;3县代直营;4县代下属;5区代直营;6区代下属")
     private String partnership;
 
+    @ApiModelProperty("资质审核流程id")
+    private String qualifyVerifyId;
+
+    @ApiModelProperty("意向合同编号")
+    private String intentionContractNo;
+
     @ApiModelProperty("意向签约时间")
     private Date wantSignTime;
 

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

@@ -54,11 +54,17 @@ public class HyPartnerInterviewDO implements Serializable {
     @ApiModelProperty("授权码")
     private String authCode;
 
-    @ApiModelProperty("资质审核流程id")
-    private String qualifyVerifyId;
+    @ApiModelProperty("通过函编码")
+    private String passCode;
 
-    @ApiModelProperty("函文件url")
-    private String passFileUrl;
+    @ApiModelProperty("函文件Pdf url")
+    private String passPdfUrl;
+
+    @ApiModelProperty("函文件image url")
+    private String passImageUrl;
+
+    @ApiModelProperty("审核通过时间")
+    private Date passTime;
 
     @ApiModelProperty("有效期")
     private Date expiryDate;

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

@@ -12,9 +12,9 @@ import lombok.Data;
 @Data
 @ApiModel
 public class GetFreeBusyListReq {
-    @ApiModelProperty("开始时间")
+    @ApiModelProperty(value = "开始时间", required = true)
     private String startDate;
-    @ApiModelProperty("结束时间")
+    @ApiModelProperty(value = "结束时间",required = true)
     private String endDate;
     @ApiModelProperty("线索id(C端使用)")
     private String lineId;

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

@@ -0,0 +1,58 @@
+package com.cool.store.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2023/5/30 9:49
+ * @Version 1.0
+ */
+@Data
+@ApiModel
+public class PartnerUserInfoRequest {
+
+    @ApiModelProperty("partnerId")
+    private String partnerId;
+
+    @ApiModelProperty("手机号")
+    private String mobile;
+
+    @ApiModelProperty("申请人姓名")
+    private String username;
+
+    @ApiModelProperty("常驻区域")
+    private String liveArea;
+
+    @ApiModelProperty("意向开店区域ID")
+    private String wantShopArea;
+
+    @ApiModelProperty("意向开店区域Name")
+    private Long wantShopAreaName;
+
+    @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
+    private Integer acceptAdjustType;
+
+    @ApiModelProperty("邀请码")
+    private String inviteCode;
+
+    @ApiModelProperty("店铺编码")
+    private String shopCode;
+
+    @ApiModelProperty("店铺名称")
+    private String shopName;
+
+    @ApiModelProperty("店铺ID")
+    private String shopId;
+
+    @ApiModelProperty("推荐加盟商id")
+    private String recommendPartnerId;
+
+    @ApiModelProperty("推荐加盟商姓名")
+    private String recommendPartnerName;
+
+    @ApiModelProperty("推荐加盟商手机号")
+    private String recommendPartnerMobile;
+
+}

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

@@ -0,0 +1,23 @@
+package com.cool.store.request;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@Api("资质审核回调入参")
+public class QualificationCallbackReq {
+
+    @ApiModelProperty(value = "审核流程id", required = true)
+    private String instanceId;
+
+    @ApiModelProperty(value = "流程状态 已完成：FINISHED, 已作废：CANCELED", required = true)
+    private String sequenceStatus;
+
+    @ApiModelProperty(value = "意向签约人", required = true)
+    private String intendedSigner;
+
+    @ApiModelProperty(value = "审核通过时间", required = true)
+    private long modifiedTime;
+
+}

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

@@ -51,4 +51,7 @@ public class PartnerBaseInfoVO {
     @ApiModelProperty("住址")
     private String liveAddress;
 
+    @ApiModelProperty("0待提交、1待审核、2已通过、3未通过")
+    private Integer status;
+
 }

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

@@ -55,6 +55,9 @@ public class PartnerUserInfoVO {
     @ApiModelProperty("是否需要提交意向信息")
     private Boolean needSubmitWantInfo;
 
+    @ApiModelProperty("线索id")
+    private Long partnerLineId;
+
     public Boolean getNeedSubmitWantInfo() {
         if(StringUtils.isBlank(username)
                 || StringUtils.isBlank(mobile)