From 97547da023f237a0f1da7b3d854c2c8200ac9309 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 19 Feb 2024 17:46:21 +0800
Subject: [PATCH] =?UTF-8?q?unionid=20=20=E7=BB=91=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/lpkcustomer/LpkCustomerService.java        | 14 +++++++-------
 .../biz/lpkgiftcard/LpkGiftCardService.java        |  4 +++-
 2 files changed, 10 insertions(+), 8 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 83256b8..74d80d8 100644
--- a/src/main/java/com/yxt/yythmall/biz/lpkcustomer/LpkCustomerService.java
+++ b/src/main/java/com/yxt/yythmall/biz/lpkcustomer/LpkCustomerService.java
@@ -93,10 +93,10 @@ 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);
+        map.put("unionid",unionid);
         map.put("openid", openid);
         LpkCustomer lpkCustomer = baseMapper.selectOne(new QueryWrapper<LpkCustomer>().eq("wxMpOpenid", openid));
 //        List<LpkCustomer> lpkCustomer= baseMapper.getCustomer(openid);
@@ -105,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");
@@ -135,10 +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);
-//        }
+        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/lpkgiftcard/LpkGiftCardService.java b/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java
index 6372d12..511038f 100644
--- a/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java
+++ b/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java
@@ -169,7 +169,9 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
     @Transactional(rollbackFor = Exception.class)
     public ResultBean bindAllCard(BindCardDto bindCardDto) {
         ResultBean rb = new ResultBean().fail();
-
+        if(StringUtils.isBlank(bindCardDto.getCustomerSid())){
+            return rb.setMsg("参数不全");
+        }
         if (bindCardDto.getCode().substring(0, 2).equals("99")) {
             ResultBean rb2 = empCardGiftService.bindCard(bindCardDto);
             return rb2;