From 972d3bc71115ec977dccf835fbcd148da3bcc86c Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期二, 03 九月 2019 16:41:49 +0800 Subject: [PATCH] 统计可用的免单券数量-countUsableFreeCouponForBuy --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java | 37 ++++++++++++++++++++++++------------- 1 files changed, 24 insertions(+), 13 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java index e0d3640..14ef53e 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java @@ -36,8 +36,8 @@ import com.yeshi.fanli.entity.bus.user.UserInfo; import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum; import com.yeshi.fanli.entity.bus.user.WeiXinUser; -import com.yeshi.fanli.exception.UserAccountException; import com.yeshi.fanli.exception.user.ForbiddenUserIdentifyCodeException; +import com.yeshi.fanli.exception.user.UserAccountException; import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce; import com.yeshi.fanli.service.inter.msg.UserAccountMsgNotificationService; @@ -697,8 +697,9 @@ user.setRank(0); if (StringUtil.isNullOrEmpty(user.getPortrait())) user.setPortrait(Constant.systemCommonConfig.getDefaultPortrait()); - userInfoMapper.insertSelective(user); + + // 鏄电О涓虹┖鏃� 榛樿鏄电О if (StringUtil.isNullOrEmpty(user.getNickName())) { UserInfo updateUserInfo = new UserInfo(user.getId()); updateUserInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName() + user.getId()); @@ -848,15 +849,23 @@ updateUserInfo.setWxOpenId(weiXinUser.getOpenid()); updateUserInfo.setWxPic(weiXinUser.getHeadimgurl()); updateUserInfo.setWxUnionId(weiXinUser.getUnionid()); - updateUserInfo.setNickName(weiXinUser.getNickname()); - updateUserInfo.setPortrait(weiXinUser.getHeadimgurl()); - if (StringUtil.isNullOrEmpty(weiXinUser.getNickname())) { - updateUserInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName()); + + // 灏嗛粯璁ゆ樀绉版浛鎹㈡垚寰俊鏄电О + String defaultNickName = Constant.systemCommonConfig.getDefaultNickName(); + if (!StringUtil.isNullOrEmpty(defaultNickName) && !StringUtil.isNullOrEmpty(weiXinUser.getNickname())) { + defaultNickName = defaultNickName + uid; + if ((defaultNickName.equals(user.getNickName()) || "杩斿埄鍒�".equals(user.getNickName()))) { + updateUserInfo.setNickName(weiXinUser.getNickname()); + } } - if (StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl())) { - updateUserInfo.setPortrait(Constant.systemCommonConfig.getDefaultPortrait()); + // 灏嗛粯璁ゅご鍍忔浛鎹㈡垚寰俊澶村儚 + String defaultPortrait = Constant.systemCommonConfig.getDefaultPortrait(); + if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl()) && !StringUtil.isNullOrEmpty(defaultPortrait) + && defaultPortrait.equals(user.getPortrait())) { + updateUserInfo.setPortrait(weiXinUser.getHeadimgurl()); } + userInfoMapper.updateByPrimaryKeySelective(updateUserInfo); userAccountMsgNotificationService.changeBindingSuccess(uid, MsgAccountDetailFactory.TYPE_WX); @@ -1023,7 +1032,7 @@ } else { userInfo = new UserInfo(); userInfo.setAppId(appId); - userInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName()); + //userInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName()); userInfo.setPortrait(Constant.systemCommonConfig.getDefaultPortrait()); userInfo.setPhone(phone); userInfo.setLoginType(loginType); @@ -1234,11 +1243,13 @@ // 灏嗛粯璁ゆ樀绉版浛鎹㈡垚寰俊鏄电О String defaultNickName = Constant.systemCommonConfig.getDefaultNickName(); - if (!StringUtil.isNullOrEmpty(weiXinUser.getNickname()) && !StringUtil.isNullOrEmpty(defaultNickName) - && defaultNickName.equals(user.getNickName())) { - updateUserInfo.setNickName(weiXinUser.getNickname()); + if (!StringUtil.isNullOrEmpty(defaultNickName) && !StringUtil.isNullOrEmpty(weiXinUser.getNickname())) { + defaultNickName = defaultNickName + uid; + if ((defaultNickName.equals(user.getNickName()) || "杩斿埄鍒�".equals(user.getNickName()))) { + updateUserInfo.setNickName(weiXinUser.getNickname()); + } } - + // 灏嗛粯璁ゅご鍍忔浛鎹㈡垚寰俊澶村儚 String defaultPortrait = Constant.systemCommonConfig.getDefaultPortrait(); if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl()) && !StringUtil.isNullOrEmpty(defaultPortrait) -- Gitblit v1.8.0