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:
pserimal
2023-06-16 19:11:37 +08:00
parent 6733deeba8 05b51c069c
commit 4bdfc0b271
28 changed files with 349 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,4 +227,47 @@ public class SysDepartmentDTO {
}
return resultList;
}
public static RegionDO convertRegionDO(SysDepartmentDTO dept, Multimap<String, String> leaderDeptMap, RegionDO parentRegion){
RegionDO region = new RegionDO();
region.setRegionId(dept.getId());
region.setName(dept.getName());
region.setParentId(dept.getParentId());
region.setUnclassifiedFlag(CommonConstants.ZERO);
region.setLeaderUserId(dept.getLeaderUserId());
region.setOrderNum(dept.getDepartOrder());
region.setThirdDeptId(dept.getId());
region.setCreateTime(System.currentTimeMillis());
region.setUpdateTime(System.currentTimeMillis());
String regionPath = parentRegion.getRegionPath() + region.getRegionId() + CommonConstants.PATH_SPILT;
region.setRegionPath(regionPath);
region.setDeleted(Boolean.FALSE);
if(CollectionUtils.isNotEmpty(dept.getDeptManagerUseridList())){
for (String leader : dept.getDeptManagerUseridList()) {
leaderDeptMap.put(leader, dept.getId());
}
}
return region;
}
public static RegionDO convertRegionDO(SysDepartmentDTO dept, Multimap<String, String> leaderDeptMap){
RegionDO region = new RegionDO();
region.setRegionId(dept.getId());
region.setName(dept.getName());
region.setParentId(dept.getParentId());
region.setUnclassifiedFlag(CommonConstants.ZERO);
region.setLeaderUserId(dept.getLeaderUserId());
region.setOrderNum(dept.getDepartOrder());
region.setThirdDeptId(dept.getId());
region.setCreateTime(System.currentTimeMillis());
region.setUpdateTime(System.currentTimeMillis());
region.setDeleted(Boolean.FALSE);
if(CollectionUtils.isNotEmpty(dept.getDeptManagerUseridList())){
for (String leader : dept.getDeptManagerUseridList()) {
leaderDeptMap.put(leader, dept.getId());
}
}
return region;
}
}

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

@@ -50,4 +50,22 @@ public class HyPartnerUserInfoDO implements Serializable {
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("店铺编码")
private String shopCode;
@ApiModelProperty("店铺名称")
private String shopName;
@ApiModelProperty("店铺ID")
private String shopId;
@ApiModelProperty("推荐加盟商id")
private String recommendPartnerId;
@ApiModelProperty("推荐加盟商姓名")
private String recommendPartnerName;
@ApiModelProperty("推荐加盟商手机号")
private String recommendPartnerMobile;
}

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

@@ -31,6 +31,10 @@ public class OpenAreaTreeVO {
@ApiModelProperty("状态 open-开放 keyOpen-重点开放 notOpen-未开放 saturated-已饱和")
private String areaStatus;
private String backgroundBanner;
private String detailBanner;
@ApiModelProperty("子区域")
List<OpenAreaTreeVO> childNode;
}

9
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java
View File

@@ -43,6 +43,9 @@ public class PartnerUserInfoVO {
@ApiModelProperty("邀请码")
private String inviteCode;
@ApiModelProperty("是否填写加盟需知")
private Integer isWritePartnerKnow;
@ApiModelProperty("openid")
private String openid;
@@ -50,15 +53,17 @@ public class PartnerUserInfoVO {
private String unionId;
@ApiModelProperty("是否需要提交意向信息")
private Boolean isNeedSubmitWantInfo;
private Boolean needSubmitWantInfo;
public Boolean getNeedSubmitWantInfo() {
if(StringUtils.isBlank(username)
|| StringUtils.isBlank(mobile)
|| StringUtils.isBlank(liveArea)
|| StringUtils.isBlank(wantShopArea)){
|| StringUtils.isBlank(wantShopArea)
|| Objects.isNull(acceptAdjustType)){
return true;
}
return false;
}
}