diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index 24d20038b..d443c15dd 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -9,11 +9,9 @@ import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxCUserBasicInfo; +import com.iformall.enums.EnumScoreType; import com.iformall.exception.MallinkException; -import com.iformall.service.CUserTokenService; -import com.iformall.service.WxAppinfoService; -import com.iformall.service.WxCUserBasicChildService; -import com.iformall.service.WxCUserBasicInfoService; +import com.iformall.service.*; import com.iformall.service.wechat.FmOpenService; import com.iformall.utils.Constant; import com.iformall.utils.IPUtil; @@ -61,6 +59,12 @@ public class BaseController { @Autowired private CUserTokenService cUserTokenService; + + @Autowired + private WxScoreRulesService wxScoreRulesService; + + @Autowired + private MemCouponFromDspService memCouponFromDspService; @Autowired @Qualifier("objectCommonRedisTemplate") @@ -254,7 +258,7 @@ public class BaseController { byId.setAvatarUrl(avatarUrl); byId.setSex(sex); wxCUserBasicInfoService.update(byId); - removeCacheMember(basicInfo.getId()); + removeCacheMember(byId.getId()); return byId.getId(); } else { basicInfo = new WxCUserBasicInfo(); @@ -266,6 +270,15 @@ public class BaseController { basicInfo.setSex(sex); wxCUserBasicInfoService.save(basicInfo); removeCacheMember(basicInfo.getId()); + + // 首次授权, 增加成长值及积分 + // 成长值 + wxScoreRulesService.addScore(tenantEntity, EnumScoreType.WECHAT_PHONE, basicInfo); + // 增加积分 + wxCUserBasicInfoService.addCredit(basicInfo.getId(),tenantEntity,EnumScoreType.WECHAT_PHONE); + // 外部注券 + memCouponFromDspService.couponOrderFromDsp(tenantEntity, userPhone); + 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 98671232b..c9c285775 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -598,11 +598,6 @@ public class WxUserGrantController extends BaseController { return new ResultData(ErrorCode.USER_IS_EMPTY); } - boolean isFirstPhone = false; - if(user.getUserId() == null) { - isFirstPhone = true; - } - WxMaService wxMaService = getWeappService(user.getAppId()); String session_key = user.getSessionKey(); @@ -638,16 +633,6 @@ public class WxUserGrantController extends BaseController { removeCacheCUser(); - if(isFirstPhone) { - // 首次授权, 增加成长值及积分 - // 成长值 - wxScoreRulesService.addScore(getTenantInfo(),EnumScoreType.WECHAT_PHONE, user); - // 增加积分 - wxCUserBasicInfoService.addCredit(user.getUserId(),getTenantInfo(),EnumScoreType.WECHAT_PHONE); - // 外部注券 - memCouponFromDspService.couponOrderFromDsp(tenantEntity, phoneNoInfo.getPhoneNumber()); - } - resultMap.put("msg", "授权手机成功!"); resultMap.put("phone", phoneNoInfo.getPhoneNumber()); } else { diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java index 2b3f483ce..ac874605e 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java @@ -43,5 +43,5 @@ public interface WxCUserMapper extends CommonMapper { List findOpenIdList(@Param("userId")Long userId, @Param("tenantId")String tenantId); - List findTokenList(@Param("userId")Long userId, @Param("tenantId")String tenantId); + List findTokenList(@Param("id")Long id,@Param("userId")Long userId, @Param("tenantId")String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java index 56340972e..8cd183f35 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java @@ -324,7 +324,7 @@ public class WxCUserServiceImpl implements WxCUserService { @Override public void delForUserIdOnly(Long id, Long userId, String tenantId) { - List tokenList = wxCUserMapper.findTokenList(userId, tenantId); + List tokenList = wxCUserMapper.findTokenList(id,userId, tenantId); if(tokenList != null){ for (String token:tokenList) { cUserTokenService.removeTokenCache(token); diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index e35be7316..4146ec925 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -433,7 +433,7 @@