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

Merge branch 'refs/heads/master' into cc_20251112_wallet

Browse Source 
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
This commit is contained in:
wangff
2025-11-27 16:38:50 +08:00
parent c89013ff8d ea8560d14a
commit 6ff0ed86fc
35 changed files with 1724 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,26 @@
package com.cool.store.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2025/11/3 15:22
* @Version 1.0
*/
@Data
public class ShopSignerInfoDTO {
@ApiModelProperty("签约人1姓名")
private String partnershipSignatoryFirst;
@ApiModelProperty("签约人1手机号")
private String partnershipSignatoryFirstMobile;
@ApiModelProperty("签约人2姓名")
private String partnershipSignatorySecond;
@ApiModelProperty("签约人2手机号")
private String partnershipSignatorySecondMobile;
}

55
coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/DecorationListDTO.java Normal file
View File

@@ -0,0 +1,55 @@
package com.cool.store.dto.decoration;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2025/11/3 11:23
* @Version 1.0
*/
@Data
public class DecorationListDTO {
private Long id;
@ApiModelProperty("装修团队ID")
private Long teamId;
@ApiModelProperty("门店ID")
private Long shopId;
@ApiModelProperty("门店名称")
private String shopName;
@ApiModelProperty("门店编号")
private String shopCode;
@ApiModelProperty("门店区域ID")
private String regionId;
@ApiModelProperty("门店区域名称")
private String regionName;
@ApiModelProperty("门店省")
private String province;
@ApiModelProperty("门店市")
private String city;
@ApiModelProperty("门店县")
private String district;
@ApiModelProperty("门店详细地址")
private String detailAddress;
@ApiModelProperty("门店类型")
private Integer storeType;
@ApiModelProperty("门店签约类型")
private Integer signType;
@ApiModelProperty("门店装修分配状态")
private Integer decorationDescStatus;
}

25
coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/DecorationTeamDTO.java Normal file
View File

@@ -0,0 +1,25 @@
package com.cool.store.dto.decoration;
import lombok.Data;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2025/10/29 18:41
* @Version 1.0
*/
@Data
public class DecorationTeamDTO {
private Long id;
private String teamName;
private String teamCode;
private Integer useSystem;
private List<TeamAreaMappingDTO> cityList;
}

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

@@ -0,0 +1,21 @@
package com.cool.store.dto.decoration;
import lombok.Data;
import javax.persistence.Column;
/**
* @Author suzhuhong
* @Date 2025/10/29 19:01
* @Version 1.0
*/
@Data
public class TeamAreaMappingDTO {
private Long teamId;
private Long openCityId;
private String openCityName;
}

168
coolstore-partner-model/src/main/java/com/cool/store/entity/decoration/DecorationTeamConfigDO.java Normal file
View File

@@ -0,0 +1,168 @@
package com.cool.store.entity.decoration;
import java.util.Date;
import javax.persistence.*;
@Table(name = "zxjp_decoration_team_config")
public class DecorationTeamConfigDO {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
/**
* 团队名称
*/
@Column(name = "team_name")
private String teamName;
/**
* 团队编号
*/
@Column(name = "team_code")
private String teamCode;
/**
* 使用系统（1-CRM，2-红圈通）
*/
@Column(name = "use_system")
private Integer useSystem;
/**
* 创建时间
*/
@Column(name = "create_time")
private Date createTime;
/**
* 更新时间
*/
@Column(name = "update_time")
private Date updateTime;
/**
* 删除状态（0-正常，1-删除）
*/
private Integer deleted;
/**
* @return id
*/
public Long getId() {
return id;
}
/**
* @param id
*/
public void setId(Long id) {
this.id = id;
}
/**
* 获取团队名称
*
* @return team_name - 团队名称
*/
public String getTeamName() {
return teamName;
}
/**
* 设置团队名称
*
* @param teamName 团队名称
*/
public void setTeamName(String teamName) {
this.teamName = teamName;
}
/**
* 获取团队编号
*
* @return team_code - 团队编号
*/
public String getTeamCode() {
return teamCode;
}
/**
* 设置团队编号
*
* @param teamCode 团队编号
*/
public void setTeamCode(String teamCode) {
this.teamCode = teamCode;
}
/**
* 获取使用系统（1-CRM，2-红圈通）
*
* @return use_system - 使用系统（1-CRM，2-红圈通）
*/
public Integer getUseSystem() {
return useSystem;
}
/**
* 设置使用系统（1-CRM，2-红圈通）
*
* @param useSystem 使用系统（1-CRM，2-红圈通）
*/
public void setUseSystem(Integer useSystem) {
this.useSystem = useSystem;
}
/**
* 获取创建时间
*
* @return create_time - 创建时间
*/
public Date getCreateTime() {
return createTime;
}
/**
* 设置创建时间
*
* @param createTime 创建时间
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* 获取更新时间
*
* @return update_time - 更新时间
*/
public Date getUpdateTime() {
return updateTime;
}
/**
* 设置更新时间
*
* @param updateTime 更新时间
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
/**
* 获取删除状态（0-正常，1-删除）
*
* @return deleted - 删除状态（0-正常，1-删除）
*/
public Integer getDeleted() {
return deleted;
}
/**
* 设置删除状态（0-正常，1-删除）
*
* @param deleted 删除状态（0-正常，1-删除）
*/
public void setDeleted(Integer deleted) {
this.deleted = deleted;
}
}

145
coolstore-partner-model/src/main/java/com/cool/store/entity/decoration/ShopDecorationAssignDO.java Normal file
View File

@@ -0,0 +1,145 @@
package com.cool.store.entity.decoration;
import java.util.Date;
import javax.persistence.*;
@Table(name = "zxjp_shop_decoration_assign")
public class ShopDecorationAssignDO {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
/**
* 装修团队id
*/
@Column(name = "shop_id")
private Long shopId;
/**
* 分配状态（0-待分配，1-已分配）
*/
@Column(name = "decoration_desc_status")
private Integer decorationDescStatus;
/**
* 装修团队id
*/
@Column(name = "decoration_team_id")
private Long decorationTeamId;
/**
* 创建时间
*/
@Column(name = "created_time")
private Date createdTime;
/**
* 更新时间
*/
@Column(name = "updated_time")
private Date updatedTime;
/**
* @return id
*/
public Long getId() {
return id;
}
/**
* @param id
*/
public void setId(Long id) {
this.id = id;
}
/**
* 获取装修团队id
*
* @return shop_id - 装修团队id
*/
public Long getShopId() {
return shopId;
}
/**
* 设置装修团队id
*
* @param shopId 装修团队id
*/
public void setShopId(Long shopId) {
this.shopId = shopId;
}
/**
* 获取分配状态（0-待分配，1-已分配）
*
* @return decoration_desc_status - 分配状态（0-待分配，1-已分配）
*/
public Integer getDecorationDescStatus() {
return decorationDescStatus;
}
/**
* 设置分配状态（0-待分配，1-已分配）
*
* @param decorationDescStatus 分配状态（0-待分配，1-已分配）
*/
public void setDecorationDescStatus(Integer decorationDescStatus) {
this.decorationDescStatus = decorationDescStatus;
}
/**
* 获取装修团队id
*
* @return decoration_team_id - 装修团队id
*/
public Long getDecorationTeamId() {
return decorationTeamId;
}
/**
* 设置装修团队id
*
* @param decorationTeamId 装修团队id
*/
public void setDecorationTeamId(Long decorationTeamId) {
this.decorationTeamId = decorationTeamId;
}
/**
* 获取创建时间
*
* @return created_time - 创建时间
*/
public Date getCreatedTime() {
return createdTime;
}
/**
* 设置创建时间
*
* @param createdTime 创建时间
*/
public void setCreatedTime(Date createdTime) {
this.createdTime = createdTime;
}
/**
* 获取更新时间
*
* @return updated_time - 更新时间
*/
public Date getUpdatedTime() {
return updatedTime;
}
/**
* 设置更新时间
*
* @param updatedTime 更新时间
*/
public void setUpdatedTime(Date updatedTime) {
this.updatedTime = updatedTime;
}
}

97
coolstore-partner-model/src/main/java/com/cool/store/entity/decoration/TeamAreaMappingDO.java Normal file
View File

@@ -0,0 +1,97 @@
package com.cool.store.entity.decoration;
import java.util.Date;
import javax.persistence.*;
@Table(name = "zxjp_team_area_mapping")
public class TeamAreaMappingDO {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
/**
* 团队ID
*/
@Column(name = "team_id")
private Long teamId;
/**
* 城市ID
*/
@Column(name = "open_city_id")
private Long openCityId;
/**
* 创建时间
*/
@Column(name = "create_time")
private Date createTime;
/**
* @return id
*/
public Long getId() {
return id;
}
/**
* @param id
*/
public void setId(Long id) {
this.id = id;
}
/**
* 获取团队ID
*
* @return team_id - 团队ID
*/
public Long getTeamId() {
return teamId;
}
/**
* 设置团队ID
*
* @param teamId 团队ID
*/
public void setTeamId(Long teamId) {
this.teamId = teamId;
}
/**
* 获取城市ID
*
* @return open_city_id - 城市ID
*/
public Long getOpenCityId() {
return openCityId;
}
/**
* 设置城市ID
*
* @param openCityId 城市ID
*/
public void setOpenCityId(Long openCityId) {
this.openCityId = openCityId;
}
/**
* 获取创建时间
*
* @return create_time - 创建时间
*/
public Date getCreateTime() {
return createTime;
}
/**
* 设置创建时间
*
* @param createTime 创建时间
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
}

21
coolstore-partner-model/src/main/java/com/cool/store/request/decoration/AddTeamRequest.java Normal file
View File

@@ -0,0 +1,21 @@
package com.cool.store.request.decoration;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2025/10/29 16:13
* @Version 1.0
*/
@Data
public class AddTeamRequest {
@ApiModelProperty("团队名称")
private String teamName;
@ApiModelProperty("负责区域列表 直传市ID，选择省时，将市Id全部传入")
private List<Long> openCityIdList;
@ApiModelProperty("团队名称")
private Integer userSystem;
}

38
coolstore-partner-model/src/main/java/com/cool/store/request/decoration/DecorationListRequest.java Normal file
View File

@@ -0,0 +1,38 @@
package com.cool.store.request.decoration;
import com.cool.store.common.PageBasicInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2025/11/3 13:31
* @Version 1.0
*/
@Data
public class DecorationListRequest extends PageBasicInfo {
@ApiModelProperty("关键字 门店名称/门店编码")
private String keyword;
@ApiModelProperty("门店类型")
private Integer storeType;
@ApiModelProperty("门店签约类型")
private Integer signType;
@ApiModelProperty("门店区域ID")
private Integer regionId;
@ApiModelProperty("门店意向开店区域")
private Long wantShopAreaId;
@ApiModelProperty(value = "门店意向开店区域IDs",hidden = true)
private List<Long> wantShopAreaIds;
@ApiModelProperty("门店装修分配状态")
private Integer decorationDescStatus;
}

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

@@ -0,0 +1,15 @@
package com.cool.store.request.decoration;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2025/11/3 16:40
* @Version 1.0
*/
@Data
public class DeletedRequest {
private Long teamId;
}

17
coolstore-partner-model/src/main/java/com/cool/store/request/decoration/UpdateConstructionTeamRequest.java Normal file
View File

@@ -0,0 +1,17 @@
package com.cool.store.request.decoration;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2025/11/3 16:00
* @Version 1.0
*/
@Data
public class UpdateConstructionTeamRequest {
private Long id;
private Long teamId;
}

28
coolstore-partner-model/src/main/java/com/cool/store/request/decoration/UpdateTeamRequest.java Normal file
View File

@@ -0,0 +1,28 @@
package com.cool.store.request.decoration;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2025/10/29 16:16
* @Version 1.0
*/
@Data
public class UpdateTeamRequest {
@ApiModelProperty("ID")
private Long id;
@ApiModelProperty("团队名称")
private String teamCode;
@ApiModelProperty("团队名称")
private String teamName;
@ApiModelProperty("负责区域列表 直传市ID，选择省时，将市Id全部传入")
private List<Long> openCityIdList;
@ApiModelProperty("团队名称")
private Integer userSystem;
}