From c46272806303d309aadac6517417b4177eebca1f Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Sun, 26 Jun 2022 09:49:05 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxBindingPhoneNumber.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 ff3c95e..3920da8 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;
@@ -19,7 +20,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
/**
* @author jiangyouyao
@@ -98,14 +101,15 @@
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);
- sysVipInfoDao.deleteById(loginUser.getId());
+ LogUtil.info("绑定手机号码删除会员。。"+ JSON.toJSONString(loginUser));
+ sysVipInfoDao.deleteLogicByIds(Arrays.asList(loginUser.getId()));
String token = userCacheManager.saveUserInfo(oldeUser);
AjaxResult result = AjaxResult.buildSuccessInstance("绑定成功");
result.putInMap("token",token);
--
Gitblit v1.9.1