From 00710c3ee8aaaa82040dae90bf379235015d7161 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 30 May 2024 11:45:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/controller/UserContoller.java       |  4 ++--
 .../system/cashierservice/dao/TbShopUserMapper.java    |  1 +
 .../system/cashierservice/service/LoginService.java    | 10 +++++-----
 .../system/cashierservice/service/ProductService.java  |  2 +-
 src/main/resources/mapper/TbShopUserMapper.xml         |  4 ++++
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/UserContoller.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/UserContoller.java
index df6fd58..a24b675 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/UserContoller.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/UserContoller.java
@@ -86,8 +86,8 @@ public class UserContoller {
             shopUser.setSex(tbUserInfo.getSex());
             shopUser.setBirthDay(tbUserInfo.getBirthDay());
             shopUser.setLevel(Byte.parseByte("1"));
-            String code=  RandomUtil.randomNumbers(6);
-            shopUser.setCode(code);
+            String dynamicCode = RandomUtil.randomNumbers(8);
+            shopUser.setCode(dynamicCode);
             shopUser.setTelephone(tbUserInfo.getTelephone());
             shopUser.setAmount(BigDecimal.ZERO);
             shopUser.setIsVip(Byte.parseByte("1"));
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserMapper.java
index 44b1ab8..078ba67 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserMapper.java
@@ -27,6 +27,7 @@ public interface TbShopUserMapper {
 
 
     TbShopUser selectByUserIdAndShopId(@Param("userId") String userId,@Param("shopId") String shopId);
+    List<TbShopUser> selectAllByUserId(@Param("userId") String userId);
 
 
     List<Map<String,Object>> selectByUserId(@Param("userId") String userId,@Param("shopId") String shopId);
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
index 1dae9dd..0a39bce 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
@@ -105,13 +105,13 @@ public class LoginService {
                 userInfo.setUpdatedAt(System.currentTimeMillis());
                 tbUserInfoMapper.updateByPrimaryKeySelective(userInfo);
             }
-        }else {
+        }
+        else {
             String phone = userInfo.getTelephone();
             if (StringUtils.isBlank(phone) || !phone.equals(telephone)) {
                 userInfo.setTelephone(telephone);
                 tbUserInfoMapper.updateByPrimaryKeySelective(userInfo);
-            }else {
-                List<TbShopUser>  tbShopUsers = tbShopUserMapper.selectByPhone(telephone);
+                List<TbShopUser>  tbShopUsers = tbShopUserMapper.selectAllByUserId(userInfo.getId().toString());
                 for (TbShopUser tbShopUser : tbShopUsers) {
                     tbShopUser.setTelephone(phone);
                     tbShopUserMapper.updateByPrimaryKey(tbShopUser);
@@ -183,8 +183,8 @@ public class LoginService {
             userInfo.setSex(tbShopUser.getSex());
             userInfo.setBirthDay(tbShopUser.getBirthDay());
             tbShopUser.setLevel(Byte.parseByte("1"));
-            String code=  RandomUtil.randomNumbers(6);
-            tbShopUser.setCode(code);
+            String dynamicCode = RandomUtil.randomNumbers(8);
+            tbShopUser.setCode(dynamicCode);
             tbShopUser.setUserId(userInfo.getId() + "");
             tbShopUserMapper.updateByPrimaryKey(tbShopUser);
         }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
index 0aba788..34832c6 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
@@ -82,7 +82,7 @@ public class ProductService {
             tbShopUser.setSex(tbUserInfo.getSex());
             tbShopUser.setBirthDay(tbUserInfo.getBirthDay());
             tbShopUser.setLevel(Byte.parseByte("1"));
-            tbShopUser.setCode(RandomUtil.randomNumbers(6));
+            tbShopUser.setCode(RandomUtil.randomNumbers(8));
             tbShopUser.setTelephone(tbUserInfo.getTelephone());
             tbShopUser.setAmount(BigDecimal.ZERO);
             tbShopUser.setIsVip(Byte.parseByte("1"));
diff --git a/src/main/resources/mapper/TbShopUserMapper.xml b/src/main/resources/mapper/TbShopUserMapper.xml
index 7658195..ca130d5 100644
--- a/src/main/resources/mapper/TbShopUserMapper.xml
+++ b/src/main/resources/mapper/TbShopUserMapper.xml
@@ -384,6 +384,10 @@
     select * from tb_shop_user where user_id=#{userId} and shop_id=#{shopId}
     </select>
 
+  <select id="selectAllByUserId" resultMap="BaseResultMap">
+    select * from tb_shop_user where user_id=#{userId}
+  </select>
+
     <select id="selectByOpenId" resultType="com.chaozhanggui.system.cashierservice.entity.TbShopUser">
       select * from tb_shop_user where mini_open_id = #{openId}
     </select>