From a5ae55675a33149c9ab0414e32c9e6cb93700913 Mon Sep 17 00:00:00 2001
From: wxp01309236 <wxp01309236@alibaba-inc.com>
Date: Fri, 16 Jun 2023 16:25:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/cool/store/vo/PartnerUserInfoVO.java   | 9 +++++++--
 .../store/service/impl/WechatMiniAppServiceImpl.java     | 6 ++----
 2 files changed, 9 insertions(+), 6 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 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);