From adf00538a5a181369f0db642d1e17b6c91c6b550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Mon, 8 Jan 2024 15:25:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=94liveArea=E4=B8=8EacceptAdjustType?=
 =?UTF-8?q?=E6=98=AF=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/cool/store/vo/PartnerUserInfoVO.java    | 8 ++++++--
 1 file changed, 6 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 f86927b39..5a777edfb 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
@@ -62,12 +62,16 @@ public class PartnerUserInfoVO {
     private Integer lineStatus;
 
     public Boolean getNeedSubmitWantInfo() {
+        //如果是私海 且liveArea与acceptAdjustType是空 说明通过会销进入 返回false
+        if (LineStatusEnum.PRIVATE_SEAS.getCode().equals(lineStatus)&&StringUtils.isBlank(liveArea)
+                && Objects.isNull(acceptAdjustType)){
+            return false;
+        }
         if((StringUtils.isBlank(username)
                 || StringUtils.isBlank(mobile)
                 || StringUtils.isBlank(liveArea)
                 || StringUtils.isBlank(wantShopArea)
-                || Objects.isNull(acceptAdjustType))|| (LineStatusEnum.PRIVATE_SEAS.getCode().equals(lineStatus)&&StringUtils.isBlank(liveArea)
-                && Objects.isNull(acceptAdjustType))){
+                || Objects.isNull(acceptAdjustType))){
             return true;
         }
         return false;