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

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

Browse Source 
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java
#	coolstore-partner-webb/src/main/resources/application-dev.properties
This commit is contained in:
俞扬
2023-06-16 11:48:29 +08:00
parent 0479f46eda 82eef68423
commit 2ff7b04d0c
106 changed files with 2030 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentAddDto.java
View File

@@ -1,5 +1,7 @@
package com.cool.store.dto.content;
import com.cool.store.enums.ContentSubjectEnum;
import com.cool.store.enums.ContentTypeEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,10 +15,10 @@ public class ContentAddDto {
private String status;
@ApiModelProperty(value = "栏目code", required = true)
private String subject;
private ContentSubjectEnum subject;
@ApiModelProperty(value = "类型", required = true)
private String contentType;
private ContentTypeEnum contentType;
@ApiModelProperty(value = "封面地址", required = true)
private String cover;

6
coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryListDto.java
View File

@@ -1,6 +1,8 @@
package com.cool.store.dto.content;
import com.cool.store.common.PageBasicInfo;
import com.cool.store.enums.ContentSubjectEnum;
import com.cool.store.enums.ContentTypeEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,10 +15,10 @@ public class ContentQueryListDto extends PageBasicInfo {
private String contentTitle;
@ApiModelProperty("栏目Code")
private String subject;
private ContentSubjectEnum subject;
@ApiModelProperty("类型，默认选中全部时不传值")
private String contentType;
private ContentTypeEnum contentType;
@ApiModelProperty("筛选开始时间")
private String startTime;

6
coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentUpdateDto.java
View File

@@ -1,5 +1,7 @@
package com.cool.store.dto.content;
import com.cool.store.enums.ContentSubjectEnum;
import com.cool.store.enums.ContentTypeEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,10 +18,10 @@ public class ContentUpdateDto {
private String status;
@ApiModelProperty("栏目code")
private String subject;
private ContentSubjectEnum subject;
@ApiModelProperty("类型")
private String contentType;
private ContentTypeEnum contentType;
@ApiModelProperty("封面地址")
private String cover;

33
coolstore-partner-model/src/main/java/com/cool/store/dto/partner/DescribePhoneNumberDTO.java Normal file
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;
}

17
coolstore-partner-model/src/main/java/com/cool/store/dto/partner/LineCountDTO.java Normal file
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;
}

28
coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PublicSeaLineDTO.java Normal file
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;
}

8
coolstore-partner-model/src/main/java/com/cool/store/entity/HyContentInfoDO.java
View File

@@ -1,8 +1,10 @@
package com.cool.store.entity;
import com.cool.store.enums.ContentSubjectEnum;
import com.cool.store.enums.ContentTypeEnum;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -25,10 +27,10 @@ public class HyContentInfoDO implements Serializable {
private String contentTitle;
@ApiModelProperty("栏目CODE")
private String subject;
private ContentSubjectEnum subject;
@ApiModelProperty("类型 image-图文 video-视频")
private String contentType;
private ContentTypeEnum contentType;
@ApiModelProperty("封面URL")
private String cover;

14
coolstore-partner-model/src/main/java/com/cool/store/request/LineRequest.java
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;

6
coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java
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;

8
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerEnterInterviewVO.java → coolstore-partner-model/src/main/java/com/cool/store/vo/EnterInterviewVO.java
View File

@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class PartnerEnterInterviewVO {
public class EnterInterviewVO {
@ApiModelProperty("userSig 进入会议需要的用户签名")
private String userSign;
@@ -12,4 +12,10 @@ public class PartnerEnterInterviewVO {
@ApiModelProperty("面试官id")
private String interviewerId;
@ApiModelProperty("面试官姓名")
private String interviewerName;
@ApiModelProperty("加盟商姓名")
private String partnerName;
}

18
coolstore-partner-model/src/main/java/com/cool/store/vo/EnterpriseUserSingleInfoVO.java Normal file
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;
}

6
coolstore-partner-model/src/main/java/com/cool/store/vo/HyContentInfoVO.java
View File

@@ -1,5 +1,7 @@
package com.cool.store.vo;
import com.cool.store.enums.ContentSubjectEnum;
import com.cool.store.enums.ContentTypeEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,10 +15,10 @@ public class HyContentInfoVO {
private String contentTitle;
@ApiModelProperty("栏目CODE")
private String subject;
private ContentSubjectEnum subject;
@ApiModelProperty("类型 image-图文 video-视频")
private String contentType;
private ContentTypeEnum contentType;
@ApiModelProperty("封面URL")
private String cover;

6
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java
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;

5
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerPassLetterDetailVO.java
View File

@@ -9,7 +9,10 @@ public class PartnerPassLetterDetailVO {
@ApiModelProperty("加盟商姓名")
private String partnerName;
@ApiModelProperty("编码")
@ApiModelProperty("授权码")
private String authCode;
@ApiModelProperty("通过函编码")
private String passCode;
@ApiModelProperty("审核城市")

14
coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java
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;
}

4
coolstore-partner-model/src/main/java/com/cool/store/vo/PublicSeaLineListVo.java
View File

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

41
coolstore-partner-model/src/main/java/com/cool/store/vo/cuser/IdentityCardInfoVO.java Normal file
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;
}
}