diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java index e81643ccd..905ad97d3 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java @@ -31,6 +31,10 @@ public class OpenAreaTreeVO { @ApiModelProperty("状态 open-开放 keyOpen-重点开放 notOpen-未开放 saturated-已饱和") private String areaStatus; + private String backgroundBanner; + + private String detailBanner; + @ApiModelProperty("子区域") List childNode; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java index f520cd576..327c30cff 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java @@ -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; } + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java index 4ba5554b6..478d9db9d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java @@ -94,7 +94,7 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { hyPartnerUserInfoDO.setUsername(miniProgramUser.getNickName()); hyPartnerUserInfoDO.setPartnerId(UUIDUtils.get32UUID()); hyPartnerUserInfoDAO.insertSelective(hyPartnerUserInfoDO); - // 生成一条线索 + // 生成一条线索 也可在提交加盟信息时插入 HyPartnerLineInfoDO hyPartnerLineInfoDO = new HyPartnerLineInfoDO(); hyPartnerLineInfoDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId()); hyPartnerLineInfoDAO.insertSelective(hyPartnerLineInfoDO); @@ -108,9 +108,7 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { hyPartnerUserPlatformBindDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId()); hyPartnerUserPlatformBindDAO.insertSelective(hyPartnerUserPlatformBindDO); } - userInfoVO.setPartnerId(hyPartnerUserInfoDO.getPartnerId()); - userInfoVO.setMobile(hyPartnerUserInfoDO.getMobile()); - userInfoVO.setUsername(hyPartnerUserInfoDO.getUsername()); + BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO); } userInfoVO.setOpenid(openid); userInfoVO.setUnionId(unionId);