From e70d6b27b911dba2aa8d2804b9567af0fb2252ae Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 27 Aug 2024 16:19:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=A6=82=E6=9E=9C=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E5=9C=A8PC=E5=AD=98=E5=9C=A8=20=E5=88=99?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/NotifyController.java          |  5 ----
 .../cashierservice/service/UserService.java   | 25 +++++++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/NotifyController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/NotifyController.java
index adc35e7..3ad44f8 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/NotifyController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/NotifyController.java
@@ -66,11 +66,6 @@ public class NotifyController {
 
     }
 
-    @RequestMapping("test")
-    public void test(@RequestParam String payOrderNO){
-        payService.test(payOrderNO);
-    }
-
     @RequestMapping("notifyCallBack")
     public String notifyCallBack(HttpServletRequest request){
 
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java
index fe9aa67..c6441e6 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java
@@ -274,19 +274,30 @@ public class UserService {
 
     public Result openMember(OpenMemberVo memberVo) {
         TbShopUser tbShopUser = shopUserMapper.selectByUserIdAndShopId(memberVo.getId().toString(), memberVo.getShopId().toString());
-        if(tbShopUser!=null){
-            tbShopUser.setName(StringUtils.isNotBlank(memberVo.getNickName())?memberVo.getNickName():null);
-            tbShopUser.setHeadImg(StringUtils.isNotBlank(memberVo.getHeadImg())?memberVo.getHeadImg():null);
+        if (tbShopUser != null) {
+            tbShopUser.setName(StringUtils.isNotBlank(memberVo.getNickName()) ? memberVo.getNickName() : null);
+            tbShopUser.setHeadImg(StringUtils.isNotBlank(memberVo.getHeadImg()) ? memberVo.getHeadImg() : null);
             tbShopUser.setTelephone(memberVo.getTelephone());
-            tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay())?memberVo.getBirthDay():null);
+            tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay()) ? memberVo.getBirthDay() : null);
             tbShopUser.setIsVip(Byte.parseByte("1"));
             shopUserMapper.updateByPrimaryKeySelective(tbShopUser);
-        }else {
+        } else {
             TbUserInfo tbUserInfo = userInfoMapper.selectByPrimaryKey(memberVo.getId());
+            tbShopUser = shopUserMapper.selectPCByPhoneAndShopId(memberVo.getTelephone(), memberVo.getShopId().toString());
+            if (tbShopUser != null) {
+                tbShopUser.setName(StringUtils.isNotBlank(memberVo.getNickName()) ? memberVo.getNickName() : null);
+                tbShopUser.setHeadImg(StringUtils.isNotBlank(memberVo.getHeadImg()) ? memberVo.getHeadImg() : null);
+                tbShopUser.setTelephone(memberVo.getTelephone());
+                tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay()) ? memberVo.getBirthDay() : null);
+                tbShopUser.setUserId(tbUserInfo.getId().toString());
+                tbShopUser.setMiniOpenId(tbUserInfo.getMiniAppOpenId());
+                shopUserMapper.updateByPrimaryKeySelective(tbShopUser);
+                return Result.success(CodeEnum.SUCCESS);
+            }
             tbShopUser = new TbShopUser();
-            tbShopUser.setName(StringUtils.isNotBlank(memberVo.getNickName())?memberVo.getNickName():null);
+            tbShopUser.setName(StringUtils.isNotBlank(memberVo.getNickName()) ? memberVo.getNickName() : null);
             tbShopUser.setSex(Byte.parseByte("1"));
-            tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay())?memberVo.getBirthDay():null);
+            tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay()) ? memberVo.getBirthDay() : null);
             tbShopUser.setLevel(Byte.parseByte("1"));
             String dynamicCode = RandomUtil.randomNumbers(8);
             tbShopUser.setCode(dynamicCode);