From d6628194b6d867f840d37db2ef9dc057a2084270 Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Fri, 01 Jul 2022 07:36:00 +0800
Subject: [PATCH] fix:修复用户绑定后被删除的情况

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxBindingPhoneNumber.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxBindingPhoneNumber.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxBindingPhoneNumber.java
index f69b22f..52cd2d5 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxBindingPhoneNumber.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxBindingPhoneNumber.java
@@ -1,5 +1,6 @@
 package com.matrix.system.shopXcx.api.action;
 
+import com.alibaba.fastjson.JSON;
 import com.matrix.component.tools.AES;
 import com.matrix.core.pojo.AjaxResult;
 import com.matrix.core.tools.LogUtil;
@@ -21,6 +22,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author jiangyouyao
@@ -98,14 +100,16 @@
         SysVipInfo loginUser = userCacheManager.getLoginUser();
 
 
+
         SysVipInfo oldeUser = sysVipInfoDao.selectByPhone(bindingPhoneNumber.getPhoneNumber(), loginUser.getCompanyId());
-        if(oldeUser!=null){
+        if(oldeUser!=null && !Objects.equals(oldeUser.getId(),loginUser.getId())){
             oldeUser.setIsSales(loginUser.getIsSales());
             oldeUser.setOpenId(loginUser.getOpenId());
             oldeUser.setSessionKey(loginUser.getSessionKey());
             oldeUser.setPhoto(loginUser.getAvatarUrl());
             oldeUser.setAvatarUrl(loginUser.getAvatarUrl());
             sysVipInfoDao.update(oldeUser);
+            LogUtil.info("绑定手机号码删除会员。。"+ JSON.toJSONString(loginUser));
             sysVipInfoDao.deleteLogicByIds(Arrays.asList(loginUser.getId()));
             String token = userCacheManager.saveUserInfo(oldeUser);
             AjaxResult result =   AjaxResult.buildSuccessInstance("绑定成功");

--
Gitblit v1.9.1