统计可用的免单券数量-countUsableFreeCouponForBuy

yujian

2019-09-03 972d3bc71115ec977dccf835fbcd148da3bcc86c

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java

@@ -12,6 +12,7 @@
import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpSession;



import org.springframework.context.annotation.Lazy;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.yeshi.utils.JsonUtil;

@@ -35,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;

@@ -112,6 +113,7 @@
   private JedisPool jedisPool;

   

   

   @Lazy

   @Resource

   private UserInfoModifyRecordService userInfoModifyRecordService;

   

@@ -695,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());

@@ -846,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);

@@ -1021,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);

@@ -1232,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)