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

coolstore-partner-model/coolstore-partner-model.iml

@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="coolstore-partner-common" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.6" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.60" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tika:tika-core:1.9" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.12.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.5.RELEASE" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.10.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.10.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.33" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.33" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.33" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.0.7" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.4.6" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:3.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.4.6" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.5" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun.openservices:ons-client:1.8.8.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:ons20190214:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.9" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:endpoint-util:0.0.6" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:tea:1.2.7" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.7" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
-    <orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.4" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.0.19" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.4" level="project" />
-    <orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.1.9" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.65" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.65" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:3.0.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.2.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.2.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.2.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.48.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.48.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.48.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.48.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.48.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.48.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.tencentyun:tls-sig-api-v2:2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.json:json:20180130" level="project" />
-    <orderEntry type="library" name="Maven: com.github.librepdf:openpdf:1.3.30" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-starter:2.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.4" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.8" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-ui:2.0.4" level="project" />
-  </component>
-</module>

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)