suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhangchenbiao
2023-06-29 09:41:54 +08:00
parent 5f32431f02 41363dac50
commit 21ed32a2b4
106 changed files with 2634 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
coolstore-partner-model/src/main/java/com/cool/store/dto/log/CreateQualifyVerifyDTO.java Normal file
View File

@@ -0,0 +1,16 @@
package com.cool.store.dto.log;
import lombok.Data;
import lombok.experimental.SuperBuilder;
/**
* @Author: young.yu
* @Date: 2023-06-28 00:54
* @Description:
*/
@Data
@SuperBuilder
public class CreateQualifyVerifyDTO extends LogBasicDTO{
private String summary;
private String qualiVerifyContent;
}

18
coolstore-partner-model/src/main/java/com/cool/store/dto/log/EntrustOthersDTO.java Normal file
View File

@@ -0,0 +1,18 @@
package com.cool.store.dto.log;
import lombok.Data;
import lombok.experimental.SuperBuilder;
/**
* @Author: young.yu
* @Date: 2023-06-28 00:31
* @Description:
*/
@Data
@SuperBuilder
public class EntrustOthersDTO extends LogBasicDTO{
private String beforeInterviwerName;
private String beforeInterviwerMobile;
private String afterInterviwerName;
private String afterInterviwerMobile;
}

22
coolstore-partner-model/src/main/java/com/cool/store/dto/log/LogBasicDTO.java Normal file
View File

@@ -0,0 +1,22 @@
package com.cool.store.dto.log;
import lombok.Builder;
import lombok.Data;
import lombok.experimental.SuperBuilder;
/**
* @Author: young.yu
* @Date: 2023-06-27 23:00
* @Description:
*/
@Data
@SuperBuilder
public class LogBasicDTO {
private String operateUsername;
private String operateUserId;
private String mobile;
private String operateTime;
}

15
coolstore-partner-model/src/main/java/com/cool/store/dto/log/LogFieldDTO.java Normal file
View File

@@ -0,0 +1,15 @@
package com.cool.store.dto.log;
import lombok.Data;
/**
* @Author: young.yu
* @Date: 2023-06-28 15:32
* @Description:
*/
@Data
public class LogFieldDTO {
private String code;
private String name;
private String value;
}

17
coolstore-partner-model/src/main/java/com/cool/store/dto/log/ModifyInterviewTimeDTO.java Normal file
View File

@@ -0,0 +1,17 @@
package com.cool.store.dto.log;
import lombok.Builder;
import lombok.Data;
import lombok.experimental.SuperBuilder;
/**
* @Author: young.yu
* @Date: 2023-06-28 00:23
* @Description:
*/
@Data
@SuperBuilder
public class ModifyInterviewTimeDTO extends LogBasicDTO{
private String beforeInterviewTime;
private String afterInterviewTime;
}

16
coolstore-partner-model/src/main/java/com/cool/store/dto/log/ReInterviewDTO.java Normal file
View File

@@ -0,0 +1,16 @@
package com.cool.store.dto.log;
import lombok.Data;
import lombok.experimental.SuperBuilder;
/**
* @Author: young.yu
* @Date: 2023-06-28 00:43
* @Description:
*/
@Data
@SuperBuilder
public class ReInterviewDTO extends LogBasicDTO{
private String rejectRealReason;
private String certifyFile;
}

21
coolstore-partner-model/src/main/java/com/cool/store/dto/log/RejectInterviewDTO.java Normal file
View File

@@ -0,0 +1,21 @@
package com.cool.store.dto.log;
import lombok.Data;
import lombok.experimental.SuperBuilder;
import java.util.List;
/**
* @Author: young.yu
* @Date: 2023-06-28 00:43
* @Description:
*/
@Data
@SuperBuilder
public class RejectInterviewDTO extends LogBasicDTO{
private List<String> certifyFile;
private String rejectPublicReason;
private String rejectRealReason;
}

12
coolstore-partner-model/src/main/java/com/cool/store/dto/mdm/AreaSonDTO.java Normal file
View File

@@ -0,0 +1,12 @@
package com.cool.store.dto.mdm;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AreaSonDTO {
@ApiModelProperty("父级code")
private String code;
}

12
coolstore-partner-model/src/main/java/com/cool/store/dto/partner/LineQueryInterviewDto.java Normal file
View File

@@ -0,0 +1,12 @@
package com.cool.store.dto.partner;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class LineQueryInterviewDto {
@ApiModelProperty("加盟商线索id")
private String partnerLineId;
}

62
coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/EventInfo.java Normal file
View File

@@ -0,0 +1,62 @@
package com.cool.store.dto.trtc.callback;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* @Author: young.yu
* @Date: 2023-06-29 01:17
* @Description:
*/
public class EventInfo {
@JsonProperty("RoomId")
private String roomId;
@JsonProperty("EventTs")
private long eventTs;
@JsonProperty("UserId")
private String userId;
@JsonProperty("TaskId")
private String taskId;
@JsonProperty("Payload")
private Payload payload;
public String getRoomId() {
return roomId;
}
public void setRoomId(String roomId) {
this.roomId = roomId;
}
public long getEventTs() {
return eventTs;
}
public void setEventTs(long eventTs) {
this.eventTs = eventTs;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
public Payload getPayload() {
return payload;
}
public void setPayload(Payload payload) {
this.payload = payload;
}
}

32
coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/Payload.java Normal file
View File

@@ -0,0 +1,32 @@
package com.cool.store.dto.trtc.callback;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* @Author: young.yu
* @Date: 2023-06-29 01:17
* @Description:
*/
public class Payload {
@JsonProperty("Status")
private int status;
@JsonProperty("TencentVod")
private TencentVod tencentVod;
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public TencentVod getTencentVod() {
return tencentVod;
}
public void setTencentVod(TencentVod tencentVod) {
this.tencentVod = tencentVod;
}
}

92
coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/TencentVod.java Normal file
View File

@@ -0,0 +1,92 @@
package com.cool.store.dto.trtc.callback;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* @Author: young.yu
* @Date: 2023-06-29 01:18
* @Description:
*/
public class TencentVod {
@JsonProperty("UserId")
private String userId;
@JsonProperty("TrackType")
private String trackType;
@JsonProperty("MediaId")
private String mediaId;
@JsonProperty("FileId")
private String fileId;
@JsonProperty("VideoUrl")
private String videoUrl;
@JsonProperty("CacheFile")
private String cacheFile;
@JsonProperty("StartTimeStamp")
private long startTimeStamp;
@JsonProperty("EndTimeStamp")
private int endTimeStamp;
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getTrackType() {
return trackType;
}
public void setTrackType(String trackType) {
this.trackType = trackType;
}
public String getMediaId() {
return mediaId;
}
public void setMediaId(String mediaId) {
this.mediaId = mediaId;
}
public String getFileId() {
return fileId;
}
public void setFileId(String fileId) {
this.fileId = fileId;
}
public String getVideoUrl() {
return videoUrl;
}
public void setVideoUrl(String videoUrl) {
this.videoUrl = videoUrl;
}
public String getCacheFile() {
return cacheFile;
}
public void setCacheFile(String cacheFile) {
this.cacheFile = cacheFile;
}
public long getStartTimeStamp() {
return startTimeStamp;
}
public void setStartTimeStamp(long startTimeStamp) {
this.startTimeStamp = startTimeStamp;
}
public int getEndTimeStamp() {
return endTimeStamp;
}
public void setEndTimeStamp(int endTimeStamp) {
this.endTimeStamp = endTimeStamp;
}
}

52
coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/VideoCallBackDTO.java Normal file
View File

@@ -0,0 +1,52 @@
package com.cool.store.dto.trtc.callback;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* @Author: young.yu
* @Date: 2023-06-29 01:16
* @Description:
*/
public class VideoCallBackDTO {
@JsonProperty("EventGroupId")
private int eventGroupId;
@JsonProperty("EventType")
private int eventType;
@JsonProperty("CallbackTs")
private long callbackTs;
@JsonProperty("EventInfo")
private EventInfo eventInfo;
public int getEventGroupId() {
return eventGroupId;
}
public void setEventGroupId(int eventGroupId) {
this.eventGroupId = eventGroupId;
}
public int getEventType() {
return eventType;
}
public void setEventType(int eventType) {
this.eventType = eventType;
}
public long getCallbackTs() {
return callbackTs;
}
public void setCallbackTs(long callbackTs) {
this.callbackTs = callbackTs;
}
public EventInfo getEventInfo() {
return eventInfo;
}
public void setEventInfo(EventInfo eventInfo) {
this.eventInfo = eventInfo;
}
}

2
coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerBaseInfoDO.java
View File

@@ -7,6 +7,7 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
/**
*
@@ -17,6 +18,7 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Accessors(chain = true)
public class HyPartnerBaseInfoDO implements Serializable {
@ApiModelProperty("")
private Long id;

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

@@ -30,56 +30,17 @@ public class HyPartnerCertificationInfoDO implements Serializable {
@ApiModelProperty("hy_partner_interview.id")
private Long partnerInterviewId;
@ApiModelProperty("合作关系:1总部下属;2小区代直营;3县代直营;4县代下属;5区代直营;6区代下属")
private String partnership;
@ApiModelProperty("资质审核流程id")
private String qualifyVerifyId;
@ApiModelProperty("意向合同编号")
private String intentionContractNo;
@ApiModelProperty("意向签约时间")
private Date wantSignTime;
@ApiModelProperty("数据来源")
private String dataSource;
@ApiModelProperty("加盟费")
private String partnerFee;
@ApiModelProperty("保证金")
private String securityFund;
@ApiModelProperty("技术服务费")
private String technicalServiceFee;
@ApiModelProperty("意向金金额")
private String intentionMoney;
@ApiModelProperty("意向签约人姓名")
private String intentionSignerUsername;
@ApiModelProperty("意向签约人手机号")
private String intentionSignerMobile;
@ApiModelProperty("意向签约人学历")
private String intentionEdu;
@ApiModelProperty("实控人姓名")
private String realControlUsername;
@ApiModelProperty("实控人身份证")
private String realControlIdcard;
@ApiModelProperty("签约人与实控人关系")
private String signerRealControlRelation;
@ApiModelProperty("其他实控人与签约人关系")
private String signerOtherRealControlRelation;
@ApiModelProperty("实控人与签约人关系证明")
private String signerRealControlRelationCert;
@ApiModelProperty("发起资质审核信息记录json字段")
private String certificationInfoRecordJson;
@ApiModelProperty("创建时间")
private Date createTime;

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

@@ -7,6 +7,7 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
/**
*
@@ -17,6 +18,7 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Accessors(chain = true)
public class HyPartnerLineInfoDO implements Serializable {
@ApiModelProperty("")
private Long id;
@@ -77,4 +79,7 @@ public class HyPartnerLineInfoDO implements Serializable {
@ApiModelProperty("移除黑名单原因")
private String removeBlackReason;
@ApiModelProperty("hy_partner_user_channel.id")
private Integer userChannelId;
}

43
coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserChannelDO.java Normal file
View File

@@ -0,0 +1,43 @@
package com.cool.store.entity;
import java.io.Serializable;
import java.util.Date;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.naming.Name;
/**
* hy_partner_user_channel
* @author
*/
@Data
@Accessors(chain = true)
public class HyPartnerUserChannelDO implements Serializable {
private Long id;
/**
* 来源id
*/
private Long channelId;
/**
* 来源名称
*/
private String channelName;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
private static final long serialVersionUID = 1L;
}

2
coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java
View File

@@ -7,6 +7,7 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
/**
*
@@ -17,6 +18,7 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Accessors(chain = true)
public class HyPartnerUserInfoDO implements Serializable {
@ApiModelProperty("")
private Long id;

4
coolstore-partner-model/src/main/java/com/cool/store/entity/ApprovalRegionDO.java → coolstore-partner-model/src/main/java/com/cool/store/entity/MDMAreaDO.java
View File

@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class ApprovalRegionDO {
public class MDMAreaDO {
@ApiModelProperty("id")
private Integer id;
@@ -16,7 +16,7 @@ public class ApprovalRegionDO {
private String code;
@ApiModelProperty("地区名")
private String regionName;
private String areaName;
@ApiModelProperty("地区父级编号")
private String parentCode;

19
coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerDO.java Normal file
View File

@@ -0,0 +1,19 @@
package com.cool.store.entity;
import lombok.Data;
import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
public class SyncEcCustomerDO {
private Long id;
private String customername;
private String customermobile;
private String followname;
private String followmobile;
}

26
coolstore-partner-model/src/main/java/com/cool/store/request/CustomerInfoRequest.java Normal file
View File

@@ -0,0 +1,26 @@
package com.cool.store.request;
import lombok.Data;
/**
* @author hxd
* @since 2023/2/28
*/
@Data
public class CustomerInfoRequest {
private Long crmId;
private String mobile;
private String name;
private String channel;
private String followUserMobile;
private Long lastFollowUserId;
private String followUserName;
}

15
coolstore-partner-model/src/main/java/com/cool/store/request/GetTipsInfoReq.java Normal file
View File

@@ -0,0 +1,15 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author: young.yu
* @Date: 2023-06-28 15:05
* @Description:
*/
@Data
@ApiModel
public class GetTipsInfoReq {
@ApiModelProperty("线索id")
private String partnerLineId;
}

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

@@ -12,7 +12,7 @@ public class QualificationCallbackReq {
private String instanceId;
@ApiModelProperty(value = "流程状态 已完成：FINISHED, 已作废：CANCELED", required = true)
private String sequenceStatus;
private String instanceStatus;
@ApiModelProperty(value = "意向签约人", required = true)
private String intendedSigner;

2
coolstore-partner-model/src/main/java/com/cool/store/vo/ApplyBaseInfoVO.java
View File

@@ -22,4 +22,6 @@ public class ApplyBaseInfoVO {
@ApiModelProperty("线索状态:0公海线索;1跟进中;2合作中;3黑名单")
private Integer lineStatus;
@ApiModelProperty("线索id")
private Long partnerLineId;
}