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:
zhangchenbiao
2023-06-16 16:58:20 +08:00
parent 38dd3117a9 a5ae55675a
commit a2157ba784
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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-已饱和") @ApiModelProperty("状态 open-开放 keyOpen-重点开放 notOpen-未开放 saturated-已饱和")
private String areaStatus; private String areaStatus;
private String backgroundBanner;
private String detailBanner;
@ApiModelProperty("子区域") @ApiModelProperty("子区域")
List<OpenAreaTreeVO> childNode; 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("邀请码") @ApiModelProperty("邀请码")
private String inviteCode; private String inviteCode;
@ApiModelProperty("是否填写加盟需知")
private Integer isWritePartnerKnow;
@ApiModelProperty("openid") @ApiModelProperty("openid")
private String openid; private String openid;
@@ -50,15 +53,17 @@ public class PartnerUserInfoVO {
private String unionId; private String unionId;
@ApiModelProperty("是否需要提交意向信息") @ApiModelProperty("是否需要提交意向信息")
private Boolean isNeedSubmitWantInfo; private Boolean needSubmitWantInfo;
public Boolean getNeedSubmitWantInfo() { public Boolean getNeedSubmitWantInfo() {
if(StringUtils.isBlank(username) if(StringUtils.isBlank(username)
|| StringUtils.isBlank(mobile) || StringUtils.isBlank(mobile)
|| StringUtils.isBlank(liveArea) || StringUtils.isBlank(liveArea)
|| StringUtils.isBlank(wantShopArea)){ || StringUtils.isBlank(wantShopArea)
|| Objects.isNull(acceptAdjustType)){
return true; return true;
} }
return false; return false;
} }
} }

6
coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java
View File

@@ -94,7 +94,7 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService {
hyPartnerUserInfoDO.setUsername(miniProgramUser.getNickName()); hyPartnerUserInfoDO.setUsername(miniProgramUser.getNickName());
hyPartnerUserInfoDO.setPartnerId(UUIDUtils.get32UUID()); hyPartnerUserInfoDO.setPartnerId(UUIDUtils.get32UUID());
hyPartnerUserInfoDAO.insertSelective(hyPartnerUserInfoDO); hyPartnerUserInfoDAO.insertSelective(hyPartnerUserInfoDO);
// 生成一条线索 // 生成一条线索 也可在提交加盟信息时插入
HyPartnerLineInfoDO hyPartnerLineInfoDO = new HyPartnerLineInfoDO(); HyPartnerLineInfoDO hyPartnerLineInfoDO = new HyPartnerLineInfoDO();
hyPartnerLineInfoDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId()); hyPartnerLineInfoDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId());
hyPartnerLineInfoDAO.insertSelective(hyPartnerLineInfoDO); hyPartnerLineInfoDAO.insertSelective(hyPartnerLineInfoDO);
@@ -108,9 +108,7 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService {
hyPartnerUserPlatformBindDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId()); hyPartnerUserPlatformBindDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId());
hyPartnerUserPlatformBindDAO.insertSelective(hyPartnerUserPlatformBindDO); hyPartnerUserPlatformBindDAO.insertSelective(hyPartnerUserPlatformBindDO);
} }
userInfoVO.setPartnerId(hyPartnerUserInfoDO.getPartnerId()); BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO);
userInfoVO.setMobile(hyPartnerUserInfoDO.getMobile());
userInfoVO.setUsername(hyPartnerUserInfoDO.getUsername());
} }
userInfoVO.setOpenid(openid); userInfoVO.setOpenid(openid);
userInfoVO.setUnionId(unionId); userInfoVO.setUnionId(unionId);