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

Merge branch 'dev/feat/partner1.4_20231009' into hxd/feat/partner1.4

Browse Source 
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
This commit is contained in:
xiaodong.hu
2023-09-14 10:50:58 +08:00
parent 7a628950ed 2c44793c85
commit 54d36658cd
78 changed files with 1580 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/EnterpriseUserDTO.java
View File

@@ -121,6 +121,7 @@ public class EnterpriseUserDTO implements Serializable {
enterpriseUserDO.setJobnumber(user.getJobnumber());
enterpriseUserDO.setUserStatus(UserStatusEnum.NORMAL.getCode());
enterpriseUserDO.setIsLeader(Boolean.FALSE);
enterpriseUserDO.setLeaderDeptIds("[]");
List<String> departmentLists = user.getDepartmentLists();
List<String> regionPaths = new ArrayList<>();
if(CollectionUtils.isNotEmpty(departmentLists)){
@@ -184,6 +185,7 @@ public class EnterpriseUserDTO implements Serializable {
//创建的时候给个默认值
if(FSEventTypeEnum.USER_CREATED.equals(eventType)){
enterpriseUserDO.setIsLeader(Boolean.FALSE);
enterpriseUserDO.setLeaderDeptIds("[]");
}
Collection<String> deptIds = leaderDeptMap.get(user.getUserId());
if(CollectionUtils.isNotEmpty(deptIds)){

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

@@ -84,4 +84,10 @@ public class PartnerLineInfoAndBaseInfoDTO {
private String education;
private String developmentDirector;
@ApiModelProperty("详细地址")
private String detailedAddress;
@ApiModelProperty("邮箱")
private String email;
}

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

@@ -0,0 +1,49 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import javax.persistence.Table;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @author zhangchenbiao
* @date 2023-09-11 02:20
*/
@Table(name = "beauty_camera_setting")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class BeautyCameraSettingDO implements Serializable {
@ApiModelProperty("主键id")
private Long id;
@ApiModelProperty("用户id")
private String userId;
@ApiModelProperty("美颜状态0未开启,1开启")
private Boolean beautyStatus;
@ApiModelProperty("美颜度")
private Integer beauty;
@ApiModelProperty("明亮度")
private Integer brightness;
@ApiModelProperty("红润")
private Integer ruddy;
@ApiModelProperty("删除标识")
private Boolean deleted;
@ApiModelProperty("用户创建时间")
private Date createTime;
@ApiModelProperty("修改时间")
private Date updateTime;
}

6
coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerIntentInfoDO.java
View File

@@ -98,4 +98,10 @@ public class HyPartnerIntentInfoDO implements Serializable {
@ApiModelProperty("通过证明")
private String passCertifyFile;
@ApiModelProperty("详细地址")
private String detailedAddress;
@ApiModelProperty("邮箱地址")
private String email;
}

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

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.util.Date;
@@ -16,6 +17,7 @@ import java.util.Date;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Accessors(chain = true)
public class HyPartnerLabelDO {
@ApiModelProperty("")
private Long id;

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

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.util.Date;
@@ -16,6 +17,7 @@ import java.util.Date;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Accessors(chain = true)
public class HyPartnerLabelGroupDO {
@ApiModelProperty("id")

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

@@ -0,0 +1,16 @@
package com.cool.store.entity;
import lombok.Data;
import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
public class SyncEcCustomerLabelDO {
private String mobile;
private String userPortrait;
}

12
coolstore-partner-model/src/main/java/com/cool/store/request/CallRecordBackReq.java
View File

@@ -14,4 +14,16 @@ public class CallRecordBackReq {
@ApiModelProperty(value = "录音上传地址", required = true)
private String recordUrl;
@ApiModelProperty(value = "呼叫状态: 1-呼叫接听, 2-呼叫未接听, 3-呼叫失败", required = true)
private Integer callStatus;
@ApiModelProperty(value = "呼叫失败的情况下必传，说明呼叫失败的原因")
private String failReason;
@ApiModelProperty(value = "呼叫接听情况下必传，通话开始时间，格式：yyyy-MM-dd HH:mm:ss")
private String callStartTime;
@ApiModelProperty(value = "呼叫接听情况下必传，通话结束时间，格式：yyyy-MM-dd HH:mm:ss")
private String callEndTime;
}

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

@@ -0,0 +1,30 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author zhangchenbiao
* @FileName: EditBaseInfoRequest
* @Description:
* @date 2023-09-13 10:29
*/
@Data
public class EditBaseInfoRequest {
@ApiModelProperty("线索id")
private Long partnerLineId;
@ApiModelProperty("姓名")
private String username;
@ApiModelProperty("手机号")
private String mobile;
@ApiModelProperty("意向区域")
private String wantShopArea;
@ApiModelProperty("调剂方式")
private Integer acceptAdjustType;
}

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

@@ -0,0 +1,27 @@
package com.cool.store.request;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List;
/**
* @author hxd
*/
@Data
@Accessors(chain = true)
public class GetTagRequest {
private Long groupId;
private String groupName;
private Integer sort;
private Integer type;
private List<GetTagItem> list;
@Data
@Accessors(chain = true)
public static class GetTagItem{
private Long classId;
private String className;
private int sort;
}
}

6
coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java
View File

@@ -27,6 +27,12 @@ public class PartnerIntentInfoRequest {
@ApiModelProperty("常驻区域")
private String liveArea;
@ApiModelProperty("详细地址")
private String detailedAddress;
@ApiModelProperty("邮箱地址")
private String email;
@ApiModelProperty("意向开店区域")
private String wantShopArea;

42
coolstore-partner-model/src/main/java/com/cool/store/request/beauty/AddBeautyCameraSettingRequest.java Normal file
View File

@@ -0,0 +1,42 @@
package com.cool.store.request.beauty;
import com.cool.store.entity.BeautyCameraSettingDO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @author zhangchenbiao
* @FileName: AddBeautyCameraSettingRequest
* @Description: 新增美颜配置
* @date 2023-09-11 14:31
*/
@Data
public class AddBeautyCameraSettingRequest {
@ApiModelProperty("美颜状态0未开启,1开启")
private Boolean beautyStatus;
@ApiModelProperty("美颜度")
private Integer beauty;
@ApiModelProperty("明亮度")
private Integer brightness;
@ApiModelProperty("红润")
private Integer ruddy;
public static BeautyCameraSettingDO convertDO(String userId, AddBeautyCameraSettingRequest request){
BeautyCameraSettingDO result = new BeautyCameraSettingDO();
result.setUserId(userId);
result.setBeautyStatus(request.getBeautyStatus());
result.setBeauty(request.getBeauty());
result.setBrightness(request.getBrightness());
result.setRuddy(request.getRuddy());
result.setCreateTime(new Date());
return result;
}
}

18
coolstore-partner-model/src/main/java/com/cool/store/vo/BatchTransferVO.java Normal file
View File

@@ -0,0 +1,18 @@
package com.cool.store.vo;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2023/8/30 15:16
* @Version 1.0
*/
@Data
public class BatchTransferVO {
private String partnerUserName;
private String partnerMobile;
private String errorMessage;
}

3
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java
View File

@@ -39,6 +39,9 @@ public class PartnerIntentInfoVO {
@ApiModelProperty("常驻区域")
private String liveArea;
@ApiModelProperty("详细地址")
private String detailedAddress;
@ApiModelProperty("意向开店区域")
private String wantShopArea;

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

@@ -76,6 +76,12 @@ public class PartnerLineInfoAndBaseInfoVO {
@ApiModelProperty("常驻区域")
private String liveArea;
@ApiModelProperty("详细地址")
private String detailedAddress;
@ApiModelProperty("邮箱")
private String email;
@ApiModelProperty("意向开店区域")
private String wantShopArea;

42
coolstore-partner-model/src/main/java/com/cool/store/vo/beauty/BeautyCameraSettingVO.java Normal file
View File

@@ -0,0 +1,42 @@
package com.cool.store.vo.beauty;
import com.cool.store.entity.BeautyCameraSettingDO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Objects;
/**
* @author zhangchenbiao
* @FileName: BeautyCameraSettingVO
* @Description:
* @date 2023-09-11 14:40
*/
@Data
public class BeautyCameraSettingVO {
@ApiModelProperty("美颜状态0未开启,1开启")
private Boolean beautyStatus;
@ApiModelProperty("美颜度")
private Integer beauty;
@ApiModelProperty("明亮度")
private Integer brightness;
@ApiModelProperty("红润")
private Integer ruddy;
public static BeautyCameraSettingVO convertVO(BeautyCameraSettingDO request){
if(Objects.isNull(request)){
return null;
}
BeautyCameraSettingVO result = new BeautyCameraSettingVO();
result.setBeautyStatus(request.getBeautyStatus());
result.setBeauty(request.getBeauty());
result.setBrightness(request.getBrightness());
result.setRuddy(request.getRuddy());
return result;
}
}

54
coolstore-partner-model/src/main/java/com/cool/store/vo/partner/PartnerSimpleBaseInfoVO.java Normal file
View File

@@ -0,0 +1,54 @@
package com.cool.store.vo.partner;
import com.cool.store.dto.partner.UserPortraitDTO;
import com.cool.store.entity.HyPartnerUserInfoDO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
import java.util.Objects;
/**
* @author zhangchenbiao
* @FileName: PartnerBaseInfoVO
* @Description:
* @date 2023-09-13 16:47
*/
@Data
public class PartnerSimpleBaseInfoVO {
@ApiModelProperty("线索id")
private Long partnerLineId;
@ApiModelProperty("姓名")
private String username;
@ApiModelProperty("手机号")
private String mobile;
@ApiModelProperty("意向区域")
private String wantShopArea;
@ApiModelProperty("调剂方式")
private Integer acceptAdjustType;
@ApiModelProperty("加盟申请基本信息ID")
private Long partnerBaseInfoId;
@ApiModelProperty("用户画像")
private List<UserPortraitDTO> userPortrait;
public static PartnerSimpleBaseInfoVO convertVO(Long partnerLineId, HyPartnerUserInfoDO partnerUserInfo){
if(Objects.isNull(partnerUserInfo)){
return null;
}
PartnerSimpleBaseInfoVO result = new PartnerSimpleBaseInfoVO();
result.setPartnerLineId(partnerLineId);
result.setUsername(partnerUserInfo.getUsername());
result.setMobile(partnerUserInfo.getMobile());
result.setWantShopArea(partnerUserInfo.getWantShopArea());
result.setAcceptAdjustType(partnerUserInfo.getAcceptAdjustType());
return result;
}
}