From fe11b0f211f12463703cac8c82ae83ea7235c146 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Wed, 7 Feb 2024 17:32:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=99=E9=BB=98=E7=99=BB=E5=BD=95=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96unionid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/yythmall/biz/lpkcustomer/LpkCustomerService.java | 9 ++++++---
 .../newcomerrecorecord/NewcomerRecoRecordService.java    | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/yxt/yythmall/biz/lpkcustomer/LpkCustomerService.java b/src/main/java/com/yxt/yythmall/biz/lpkcustomer/LpkCustomerService.java
index 45bb2e6..350ec67 100644
--- a/src/main/java/com/yxt/yythmall/biz/lpkcustomer/LpkCustomerService.java
+++ b/src/main/java/com/yxt/yythmall/biz/lpkcustomer/LpkCustomerService.java
@@ -24,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -94,7 +93,7 @@ public class LpkCustomerService extends MybatisBaseService<LpkCustomerMapper, Lp
         if (!jsonObject.containsKey("openid")) {
             return rb.setMsg("未获得openid，请联系管理员");
         }
-//        String unionid = jsonObject.get("unionid").toString();
+        String unionid = jsonObject.get("unionid").toString();
         String openid = jsonObject.get("openid").toString();
         Map<String, String> map = new HashMap<>();
 //        map.put("unionid",unionid);
@@ -106,7 +105,7 @@ public class LpkCustomerService extends MybatisBaseService<LpkCustomerMapper, Lp
             //新增用户
             LpkCustomer newCustomer = new LpkCustomer();
             newCustomer.setWxMpOpenid(openid);
-//            newCustomer.setUnionId(unionid);
+            newCustomer.setUnionId(unionid);
             newCustomer.setCreateTime(new Date());
             newCustomer.setIsPurchase("1");
             newCustomer.setIsNewUser("1");
@@ -136,6 +135,10 @@ public class LpkCustomerService extends MybatisBaseService<LpkCustomerMapper, Lp
             baseMapper.updateById(lpkCustomer);
             lpkCustomer = fetchBySid(lpkCustomer.getSid());
         }
+        if(StringUtils.isBlank(lpkCustomer.getUnionId())){
+            lpkCustomer.setUnionId(unionid);
+            baseMapper.updateById(lpkCustomer);
+        }
         StpUtil.login(lpkCustomer.getId());
         SaTokenInfo tokenInfo = StpUtil.getTokenInfo();
         lpkCustomer.setToken(tokenInfo.getTokenValue());
diff --git a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java
index 472cc31..709c80e 100644
--- a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java
+++ b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java
@@ -50,6 +50,9 @@ public class NewcomerRecoRecordService extends MybatisBaseService<NewcomerRecoRe
         ResultBean rb = new ResultBean();
         NewcomerRecoRecord newcomerRecoRecord = new NewcomerRecoRecord();
         List<RecommendNewUserBag> bags=recommendNewUserBagService.list(new QueryWrapper<RecommendNewUserBag>().eq("isGrounding","1"));
+        if(StringUtils.isBlank(dto.getCustomerSid())){
+            return rb.setMsg("参数不全");
+        }
         if(bags.size()==0){
             newcomerRecoRecord.setSid("");
             return rb.success().setData(newcomerRecoRecord);