From f6e14b78fe0e9e6e1fa6006ef110b04002599dc4 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Fri, 07 Oct 2022 13:58:23 +0800
Subject: [PATCH] 修复任选套餐-无限次数时无默认999的bug
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxBindingPhoneNumber.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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..e7ef97b 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,8 +20,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
/**
* @author jiangyouyao
@@ -99,14 +100,19 @@
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.setPhoto(loginUser.getPhoto());
+ oldeUser.setNickName(loginUser.getNickName());
oldeUser.setAvatarUrl(loginUser.getAvatarUrl());
sysVipInfoDao.update(oldeUser);
- sysVipInfoDao.deleteLogicByIds(Arrays.asList(loginUser.getId()));
+ LogUtil.info("绑定手机号码删除老会员openId。。"+ JSON.toJSONString(loginUser));
+// sysVipInfoDao.deleteLogicByIds(Arrays.asList(loginUser.getId()));
+ loginUser.setOpenId("--");
+ loginUser.setPhone("--");
+ sysVipInfoDao.update(loginUser);
String token = userCacheManager.saveUserInfo(oldeUser);
AjaxResult result = AjaxResult.buildSuccessInstance("绑定成功");
result.putInMap("token",token);
--
Gitblit v1.9.1