Merge branch 'developer'

姜友瑶

2022-08-09 41f67399e4e9e7f1df9ae910c1fb2ccb475435c7

 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,18 @@


        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.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);