diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index 4bfa0eac9..91d3682b7 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -2,6 +2,7 @@ package com.iformall.controller; import cn.binarywang.wx.miniapp.api.WxMaService; import com.iformall.common.ErrorCode; +import com.iformall.common.IdWorker; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxCUser; @@ -204,12 +205,14 @@ public class BaseController { byId.setPhone(userPhone); byId.setNickName(userName); byId.setAvatarUrl(avatarUrl); + byId.setSex(sex); wxCUserBasicInfoService.update(byId); return null; }else{ Date cur = new Date(); basicInfo = new WxCUserBasicInfo(); - basicInfo.setId(userId); + final IdWorker idWorker = IdWorker.get(); + basicInfo.setId(idWorker.nextId()); basicInfo.updateTenantInfo(tenantEntity); basicInfo.undateFinalTenantId(tenantEntity); basicInfo.setPhone(userPhone); @@ -221,7 +224,7 @@ public class BaseController { basicInfo.setCreateDate(cur); basicInfo.setUpdateDate(cur); wxCUserBasicInfoService.save(basicInfo); - return userId; + return basicInfo.getId(); } } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index a76c3be23..b054a727a 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -665,6 +665,10 @@ public class WxUserGrantController extends BaseController { } wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_PHONE, user); } + String key = Constant.tokenPrev + user.getOpenId(); + if(cUserTokenRedisTemplate.hasKey(key)){ + cUserTokenRedisTemplate.delete(key); + } if(isFirstPhone) { // 首次授权, 增加成长值及积分 diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index d41a3eb4b..56d9c9fc9 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -633,12 +633,12 @@