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

Merge remote-tracking branch 'origin/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009

Browse Source 
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
This commit is contained in:
俞扬
2023-09-14 17:22:02 +08:00
parent da782f7e48 54d36658cd
commit cef8be0f29
38 changed files with 1224 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
coolstore-partner-model/src/main/java/com/cool/store/dto/response/DictResultDTO.java Normal file
View File

@@ -0,0 +1,36 @@
package com.cool.store.dto.response;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List;
/**
* @author HXD
*/
@Data
@Accessors(chain = true)
public class DictResultDTO {
private String id;
private String createdBy;
private String createdTime;
private String groupCode;
private String code;
private String name;
private String type;
private String enabled;
private String remark;
private List<Dict> configList;
@Data
@Accessors(chain = true)
public static class Dict{
private String id;
private String dictId;
private String code;
private String name;
private String parentId;
private Boolean enabled;
private String remark;
}
}

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;
}

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

@@ -0,0 +1,61 @@
package com.cool.store.entity;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* hy_partner_fra_source
* @author
*/
@Data
@Accessors(chain = true)
public class HyPartnerFraSourceDO implements Serializable {
private Long id;
/**
* 来源名称
*/
private String name;
/**
* 来源code
*/
private String code;
/**
* 所属字典枚举组的id
*/
private String dictId;
/**
* 数据的id
*/
private String sourceId;
/**
* 启用标识
*/
private Boolean enabled;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 备注
*/
private String remark;
private static final long serialVersionUID = 1L;
}

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

@@ -75,4 +75,9 @@ public class HyPartnerUserInfoDO implements Serializable {
@ApiModelProperty("hy_partner_user_channel.channel_id")
private Integer userChannelId;
@ApiModelProperty("ec意向区域")
private String ecWantShopArea;
}

3
coolstore-partner-model/src/main/java/com/cool/store/request/CreateQualifyVerifyReq.java
View File

@@ -38,6 +38,9 @@ public class CreateQualifyVerifyReq {
@ApiModelProperty(value = "加盟商类型", required = true)
private KeyText fraType;
@ApiModelProperty(value = "请求来源", required = true)
private KeyText fraSource;
@ApiModelProperty(value = "合作关系", required = true)
private KeyText partnership;

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

@@ -23,4 +23,7 @@ public class CustomerInfoRequest {
private Long lastFollowUserId;
private String followUserName;
private String ecWantShopArea;
}

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;
}

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;
}
}

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;
}
}