Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

This commit is contained in:
pserimal
2023-06-16 16:10:26 +08:00
101 changed files with 2615 additions and 195 deletions

View File

@@ -0,0 +1,24 @@
package com.cool.store.dto.dept;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author zhangchenbiao
* @FileName: DepartmentEventDTO
* @Description: 部门事件
* @date 2023-06-16 15:30
*/
@Data
public class DepartmentEventDTO {
@ApiModelProperty("部门id")
private String departmentId;
@ApiModelProperty("是否变更父级节点")
private Boolean isChangeParent;
@ApiModelProperty("事件类型")
private String eventType;
}

View File

@@ -0,0 +1,27 @@
package com.cool.store.dto.mdm;
/**
* @Author: young.yu
* @Date: 2023-06-15 13:35
* @Description:
*/
public class AccessTokenDTO {
private Long expiresIn;
private String accessToken;
public Long getExpiresIn() {
return expiresIn;
}
public void setExpiresIn(Long expiresIn) {
this.expiresIn = expiresIn;
}
public String getAccessToken() {
return accessToken;
}
public void setAccessToken(String accessToken) {
this.accessToken = accessToken;
}
}

View File

@@ -0,0 +1,33 @@
package com.cool.store.dto.message;
import com.cool.store.enums.MessageTypeEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author zhangchenbiao
* @FileName: SendCardMessageDTO
* @Description:发送卡片消息
* @date 2023-06-15 11:05
*/
@Data
public class SendCardMessageDTO {
@ApiModelProperty("消息接收人")
private List<String> userIds;
@ApiModelProperty("消息链接")
private String messageUrl;
@ApiModelProperty("消息标题")
private String title;
@ApiModelProperty("消息内容")
private String content;
@ApiModelProperty("消息类型, MessageTypeEnum")
private MessageTypeEnum messageType;
}

View File

@@ -0,0 +1,33 @@
package com.cool.store.dto.partner;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author zhangchenbiao
* @FileName: DescribePhoneNumberDTO
* @Description:手机号归属
* @date 2023-06-15 20:07
*/
@Data
public class DescribePhoneNumberDTO {
@ApiModelProperty("基础运营商")
public String basicCarrier;
@ApiModelProperty("实际运营商")
public String carrier;
@ApiModelProperty("是否携号转网")
public Boolean isNumberPortability;
@ApiModelProperty("号码归属号段")
public Long numberSegment;
@ApiModelProperty("号码归属城市")
public String city;
@ApiModelProperty("号码归属省份")
public String province;
}

View File

@@ -0,0 +1,17 @@
package com.cool.store.dto.partner;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2023/6/15 21:19
* @Version 1.0
*/
@Data
public class LineCountDTO {
private String partnerId;
private Integer followCount;
}

View File

@@ -0,0 +1,28 @@
package com.cool.store.dto.partner;
import lombok.Data;
import java.util.Date;
/**
* @Author suzhuhong
* @Date 2023/6/15 20:21
* @Version 1.0
*/
@Data
public class PublicSeaLineDTO {
private Date createTime;
private Long lineId;
private String partnerId;
private String userName;
private String mobile;
private String wantShopArea;
private String acceptAdjustType;
}

View File

@@ -0,0 +1,28 @@
package com.cool.store.dto.response;
/**
* @Author: young.yu
* @Date: 2023-06-14 16:39
* @Description:
*/
public class MDMResultDTO<T> extends ResultDTO<T>{
private Object bizKey;
private String traceId;
public Object getBizKey() {
return bizKey;
}
public void setBizKey(Object bizKey) {
this.bizKey = bizKey;
}
public String getTraceId() {
return traceId;
}
public void setTraceId(String traceId) {
this.traceId = traceId;
}
}

View File

@@ -0,0 +1,104 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @author zhangchenbiao
* @date 2023-06-15 10:03
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class DingdingUserDO implements Serializable {
@ApiModelProperty("")
private Integer id;
@ApiModelProperty("用户id")
private String userid;
@ApiModelProperty("")
private String unionid;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("是不是老板")
private Integer isBoss;
@ApiModelProperty("入职时间【毫秒时间戳】")
private String hiredDate;
@ApiModelProperty("是否是高管")
private Integer isSenior;
@ApiModelProperty("分机号")
private String tel;
@ApiModelProperty("办公地点")
private String workPlace;
@ApiModelProperty("员工电子邮箱")
private String email;
@ApiModelProperty("是否已经激活true表示已激活false表示未激活")
private Integer active;
@ApiModelProperty("头像url")
private String avatar;
@ApiModelProperty("是否为企业的管理员true表示是false表示不是")
private Integer isAdmin;
@ApiModelProperty("是否号码隐藏true表示隐藏false表示不隐藏")
private Integer isHide;
@ApiModelProperty("员工工号")
private String jobNumber;
@ApiModelProperty("员工名字")
private String name;
@ApiModelProperty("国家地区码")
private String stateCode;
@ApiModelProperty("是否实名认证")
private Integer realAuthed;
@ApiModelProperty("数据库更新时间")
private Date dbUpdateTimestamp;
@ApiModelProperty("职位")
private String position;
@ApiModelProperty("手机号")
private String mobile;
@ApiModelProperty("审核状态[0、待审核1、已审核2、拒绝审核3、首次同步不处理]")
private Integer checkStatus;
@ApiModelProperty("工作状态[1、在职0、离职]")
private Integer jobStatus;
@ApiModelProperty("所在组织")
private Integer configCodeId;
@ApiModelProperty("json格式的【是不是部门老大多部门所以json】")
private String isLeaderInDepts;
@ApiModelProperty("所属部门id")
private String department;
@ApiModelProperty("扩展属性")
private String extattr;
@ApiModelProperty("用户角色信息")
private String roles;
}

View File

@@ -36,9 +36,6 @@ public class HyPartnerCertificationInfoDO implements Serializable {
@ApiModelProperty("意向签约时间")
private Date wantSignTime;
@ApiModelProperty("数据来源")
private Integer dataSource;
@ApiModelProperty("加盟费")
private String partnerFee;

View File

@@ -54,6 +54,9 @@ public class HyPartnerInterviewDO implements Serializable {
@ApiModelProperty("授权码")
private String authCode;
@ApiModelProperty("资质审核流程id")
private String qualifyVerifyId;
@ApiModelProperty("函文件url")
private String passFileUrl;

View File

@@ -0,0 +1,72 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author: young.yu
* @Date: 2023-06-14 14:18
* @Description:
*/
@Data
@ApiModel(description = "发起加盟商资质审核请求")
public class CreateQualifyVerifyReq {
@ApiModelProperty(value = "线索id", required = true)
private String lineId;
@ApiModelProperty(value = "会议id", required = true)
private String interviewId;
@ApiModelProperty(value = "加盟商id", required = true)
private String partnerId;
@ApiModelProperty(value = "面试表现记录", required = true)
private String summary;
@ApiModelProperty(value = "合作关系: 1总部下属; 2小区代直营; 3县代直营; 4县代下属; 5区代直营; 6区代下属", required = true)
private Integer partnership;
@ApiModelProperty(value = "意向签约时间", required = true, example = "YYYY-MM-DD")
private String wantSignTime;
@ApiModelProperty(value = "加盟费", required = true)
private String partnerFee;
@ApiModelProperty(value = "保证金", required = true)
private String securityFund;
@ApiModelProperty(value = "技术服务费", required = true)
private String technicalServiceFee;
@ApiModelProperty(value = "意向金金额", required = true)
private String intentionMoney;
@ApiModelProperty(value = "意向签约人姓名", required = true)
private String intentionSignerUsername;
@ApiModelProperty(value = "意向签约人手机号", required = true)
private String intentionSignerMobile;
@ApiModelProperty(value = "意向签约人学历: 1.初中及以下 2.高中 3.大专 4.本科 5.硕士及以上", required = true)
private String intentionEdu;
@ApiModelProperty(value = "实控人姓名", required = true)
private String realControlUsername;
@ApiModelProperty(value = "实控人身份证", required = true)
private String realControlIdcard;
@ApiModelProperty(value = "实控人与签约人关系: 1.本人 2.配偶 3.二代直系亲属 4.雇佣 5.其他", required = true)
private String signerRealControlRelation;
@ApiModelProperty(value = "其他实控人与签约人关系")
private String signerOtherRealControlRelation;
@ApiModelProperty(value = "实控人与签约人关系证明(文件上传地址,多个以英文逗号隔开)")
private String signerRealControlRelationCert;
}

View File

@@ -17,8 +17,11 @@ import java.util.Date;
public class LineRequest extends PageInfoRequest{
@ApiModelProperty("关键字")
private String keyWord;
@ApiModelProperty("用户名关键字")
private String userNameKeyword;
@ApiModelProperty("手机号关键字")
private String phoneKeyword;
@ApiModelProperty("意向区域")
private String intentArea;
@@ -26,8 +29,11 @@ public class LineRequest extends PageInfoRequest{
@ApiModelProperty("调剂类型")
private Integer acceptAdjustType;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("更新开始时间")
private Date updateStartTime;
@ApiModelProperty("更新结束时间")
private Date updateEndTime;

View File

@@ -18,6 +18,12 @@ public class PartnerIntentInfoRequest {
@ApiModelProperty("")
private Long id;
@ApiModelProperty("线索表ID")
private Long partnerLineId;
@ApiModelProperty("加盟商C端用户表ID partnerId ")
private String partnerId;
@ApiModelProperty("常驻区域")
private String liveArea;

View File

@@ -0,0 +1,87 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModelProperty;
/**
* @Author: young.yu
* @Date: 2023-06-14 15:06
* @Description:
*/
public class RpcCreateQualifyVerfyReq {
@ApiModelProperty(value = "意向签约时间", required = true)
private String intendedSignDate;
@ApiModelProperty(value = "请求来源", required = true)
private String fraSource;
@ApiModelProperty(value = "保证金(元)", required = true, example = "5000")
private int amtDeposit;
@ApiModelProperty(value = "授权码", required = true)
private String authCode;
@ApiModelProperty(value = "意向签约人", required = true)
private String intendedSigner;
@ApiModelProperty(value = "手机号", required = true)
private String intendedSignerTel;
@ApiModelProperty(value = "钉钉用户id", required = true)
private String dingUserId;
public String getIntendedSignDate() {
return intendedSignDate;
}
public void setIntendedSignDate(String intendedSignDate) {
this.intendedSignDate = intendedSignDate;
}
public String getFraSource() {
return fraSource;
}
public void setFraSource(String fraSource) {
this.fraSource = fraSource;
}
public int getAmtDeposit() {
return amtDeposit;
}
public void setAmtDeposit(int amtDeposit) {
this.amtDeposit = amtDeposit;
}
public String getAuthCode() {
return authCode;
}
public void setAuthCode(String authCode) {
this.authCode = authCode;
}
public String getIntendedSigner() {
return intendedSigner;
}
public void setIntendedSigner(String intendedSigner) {
this.intendedSigner = intendedSigner;
}
public String getIntendedSignerTel() {
return intendedSignerTel;
}
public void setIntendedSignerTel(String intendedSignerTel) {
this.intendedSignerTel = intendedSignerTel;
}
public String getDingUserId() {
return dingUserId;
}
public void setDingUserId(String dingUserId) {
this.dingUserId = dingUserId;
}
}

View File

@@ -0,0 +1,27 @@
package com.cool.store.request;
/**
* @Author: young.yu
* @Date: 2023-06-15 13:28
* @Description:
*/
public class RpcGetMdmTokenReq {
private String appKey;
private String appSecret;
public String getAppKey() {
return appKey;
}
public void setAppKey(String appKey) {
this.appKey = appKey;
}
public String getAppSecret() {
return appSecret;
}
public void setAppSecret(String appSecret) {
this.appSecret = appSecret;
}
}

View File

@@ -0,0 +1,18 @@
package com.cool.store.vo;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2023/6/15 14:31
* @Version 1.0
*/
@Data
public class EnterpriseUserSingleInfoVO {
private String userId;
private String userName;
private String mobile;
}

View File

@@ -30,7 +30,7 @@ public class PartnerIntentApplyInfoVO {
private String partnerId;
@ApiModelProperty("hy_partner_line_info.id")
private Long partnerLineId;
private Long lineId;
@ApiModelProperty("常驻区域")
private String liveArea;
@@ -50,4 +50,7 @@ public class PartnerIntentApplyInfoVO {
@ApiModelProperty("阶段提交时间")
private Date partnerSubmitTime;
@ApiModelProperty("阶段状态")
private String WorkflowStatus;
}

View File

@@ -22,6 +22,12 @@ public class PartnerIntentInfoVO {
@ApiModelProperty("hy_partner_user_info.partner_id")
private String partnerId;
@ApiModelProperty("加盟商姓名")
private String partnerUserName;
@ApiModelProperty("加盟商手机号")
private String partnerUserPhone;
@ApiModelProperty("hy_partner_line_info.id")
private Long partnerLineId;

View File

@@ -30,6 +30,9 @@ public class PartnerInterviewInfoVO {
@ApiModelProperty("会议结束时间")
private String endTime;
@ApiModelProperty("截止时间")
private Date deadline;
@ApiModelProperty("房间号")
private String roomId;
@@ -39,6 +42,9 @@ public class PartnerInterviewInfoVO {
@ApiModelProperty("加盟商用户名称")
private String partnerName;
@ApiModelProperty("加盟商手机号码")
private String partnerPhone;
@ApiModelProperty("面试官ID")
private String interviewerId;
@@ -50,4 +56,16 @@ public class PartnerInterviewInfoVO {
@ApiModelProperty("过程信息")
private String processInfo;
@ApiModelProperty("线索状态")
private Integer lineStatus;
@ApiModelProperty("线索ID")
private Long lineId;
@ApiModelProperty("合同号")
private String authCode;
@ApiModelProperty("审批发起时间")
private Date approveTime;
}

View File

@@ -55,8 +55,22 @@ public class PrivateSeaLineListVo {
@ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
private Integer acceptAdjustType;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("门店编码")
private String storeCode;
@ApiModelProperty("门店名称")
private String storeName;
@ApiModelProperty("线索状态")
private Integer lineStatus;
@ApiModelProperty("推荐加盟商ID")
private String recommendPartnerId;
@ApiModelProperty("推荐加盟商名称")
private String recommendPartnerName;
}

View File

@@ -59,5 +59,9 @@ public class PublicSeaLineListVo {
@ApiModelProperty("跟进次数")
private Integer followCount;
@ApiModelProperty("意向开店区域ID")
private String wantShopArea;
private String acceptAdjustType;
}

View File

@@ -0,0 +1,41 @@
package com.cool.store.vo.cuser;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author zhangchenbiao
* @FileName: IdentityCardInfoVO
* @Description:
* @date 2023-06-16 10:18
*/
@Data
public class IdentityCardInfoVO {
@ApiModelProperty("用户名")
private String username;
@ApiModelProperty("地址")
private String liveAddress;
@ApiModelProperty("出生日期")
private String birthdate;
@ApiModelProperty("性别")
private String sex;
@ApiModelProperty("身份证号")
private String idCard;
@ApiModelProperty("民族")
private String nation;
public IdentityCardInfoVO(String username, String liveAddress, String birthdate, String sex, String idCard, String nation) {
this.username = username;
this.liveAddress = liveAddress;
this.birthdate = birthdate;
this.sex = sex;
this.idCard = idCard;
this.nation = nation;
}
}