From 1d394446abb8465e63fd1fd9a768796e149edbd6 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 06 Oct 2021 19:52:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxBindingPhoneNumber.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 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 ba4c3ec..84755ba 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
@@ -97,16 +97,38 @@
if (StringUtils.isBlank(bindingPhoneNumber.getPhoneNumber())) {
return new AjaxResult(AjaxResult.STATUS_FAIL, "手机号码不能为空");
}
- //验证通过将手机号加入相应的用户数据中
- SysVipInfo sysVipInfo = new SysVipInfo();
SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
- sysVipInfo.setId(loginUser.getId());
- if(loginUser.getShopId()==null){
- sysVipInfo.setShopId(bindingPhoneNumber.getShopId());
+
+
+ SysVipInfo oldeUser = sysVipInfoDao.selectByPhone(bindingPhoneNumber.getPhoneNumber(), loginUser.getCompanyId());
+ if(oldeUser!=null){
+ 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());
+ String token = redisUserLoginUtils.saveUserInfo(oldeUser);
+ AjaxResult result = AjaxResult.buildSuccessInstance("绑定成功");
+ result.putInMap("token",token);
+ result.putInMap("userInfo",oldeUser);
+ return result;
+ }else{
+
+ //验证通过将手机号加入相应的用户数据中
+ SysVipInfo sysVipInfo = new SysVipInfo();
+
+ sysVipInfo.setId(loginUser.getId());
+ if(loginUser.getShopId()==null){
+ sysVipInfo.setShopId(bindingPhoneNumber.getShopId());
+ }
+ sysVipInfo.setPhone(bindingPhoneNumber.getPhoneNumber());
+ sysVipInfoDao.update(sysVipInfo);
+ return new AjaxResult(AjaxResult.STATUS_SUCCESS, "绑定成功");
}
- sysVipInfo.setPhone(bindingPhoneNumber.getPhoneNumber());
- sysVipInfoDao.update(sysVipInfo);
- return new AjaxResult(AjaxResult.STATUS_SUCCESS, "绑定成功");
+
+
}
--
Gitblit v1.9.1