Kaynağa Gözat

Merge branch 'release_real_202008' of https://git.malls.iformall.com/server/formallProject into release_real_202008

release_toaliyun_real
xiaohanzi 5 yıl önce
ebeveyn
işleme
7bc81844ec
4 değiştirilmiş dosya ile 10 ekleme ve 1 silme
  1. +3
    -0
      mallinkCApi/src/main/java/com/iformall/controller/BaseController.java
  2. +3
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java
  3. +3
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  4. +1
    -1
      mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml

+ 3
- 0
mallinkCApi/src/main/java/com/iformall/controller/BaseController.java Dosyayı Görüntüle

@@ -181,6 +181,9 @@ public class BaseController {
WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.findInfoByPhone(tenantEntity, userPhone); WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.findInfoByPhone(tenantEntity, userPhone);


if (basicInfo != null) { if (basicInfo != null) {
if(byId != null && !byId.getPhone().equals(basicInfo.getPhone())){
return Long.valueOf(-1);
}
// WxCUserBasicInfo basicInfo = list.get(0); // WxCUserBasicInfo basicInfo = list.get(0);
// 微信名称,统一成微信昵称 // 微信名称,统一成微信昵称
// if (!Objects.equals(basicInfo.getNickName(), user.getNickName())) { // if (!Objects.equals(basicInfo.getNickName(), user.getNickName())) {


+ 3
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java Dosyayı Görüntüle

@@ -80,6 +80,9 @@ public class WxMsgValidationcodeController extends BaseController {
} }
Long basicUserId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), userId); Long basicUserId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), userId);
if (null != basicUserId) { if (null != basicUserId) {
if(basicUserId.intValue() == -1){
return rd;
}
user.setUserId(basicUserId); user.setUserId(basicUserId);
} }
// 更新 WxCUser // 更新 WxCUser


+ 3
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java Dosyayı Görüntüle

@@ -660,6 +660,9 @@ public class WxUserGrantController extends BaseController {
// 更新到basicinfo // 更新到basicinfo
Long userBasicId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), user.getUserId()); Long userBasicId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), user.getUserId());
if (null != userBasicId) { if (null != userBasicId) {
if(userBasicId.intValue() == -1){
return new ResultData(ErrorCode.USER_PHONE_IS_FOUND);
}
user.setUserId(userBasicId); user.setUserId(userBasicId);
} }
wxCUserService.saveOrUpdate(user); wxCUserService.saveOrUpdate(user);


+ 1
- 1
mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml Dosyayı Görüntüle

@@ -17,7 +17,7 @@
<result column="phone" jdbcType="VARCHAR" property="phone"/> <result column="phone" jdbcType="VARCHAR" property="phone"/>
<result column="bopen_id" jdbcType="VARCHAR" property="bopenId"/> <result column="bopen_id" jdbcType="VARCHAR" property="bopenId"/>
<result column="web_open_id" jdbcType="VARCHAR" property="webOpenId"/> <result column="web_open_id" jdbcType="VARCHAR" property="webOpenId"/>
<result column="email" property="email"/>
<result column="email" jdbcType="VARCHAR" property="email"/>
</resultMap> </resultMap>


<sql id="allSafeColumns"> <sql id="allSafeColumns">


Yükleniyor…
İptal
Kaydet