From 1b201e0d0d540ed103cbf1a8b910aeb739de9f58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 8 Jan 2024 14:30:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=84=8F=E5=90=91=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/vo/PartnerUserInfoVO.java | 8 ++++++-- .../cool/store/service/impl/WechatMiniAppServiceImpl.java | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) 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 7ec2f1cd8..f86927b39 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 @@ -1,5 +1,6 @@ package com.cool.store.vo; +import com.cool.store.enums.LineStatusEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -58,12 +59,15 @@ public class PartnerUserInfoVO { @ApiModelProperty("线索id") private Long partnerLineId; + private Integer lineStatus; + public Boolean getNeedSubmitWantInfo() { - if(StringUtils.isBlank(username) + if((StringUtils.isBlank(username) || StringUtils.isBlank(mobile) || StringUtils.isBlank(liveArea) || StringUtils.isBlank(wantShopArea) - || Objects.isNull(acceptAdjustType)){ + || Objects.isNull(acceptAdjustType))|| (LineStatusEnum.PRIVATE_SEAS.getCode().equals(lineStatus)&&StringUtils.isBlank(liveArea) + && 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 fa294c24c..be50ac908 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 @@ -156,6 +156,7 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { HyPartnerLineInfoDO lineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId()); if (lineInfoDO != null){ userInfoVO.setPartnerLineId(lineInfoDO.getId()); + userInfoVO.setLineStatus(lineInfoDO.getLineStatus()); } } userInfoVO.setOpenid(openid);