Merge remote-tracking branch 'origin/mater-1.6.0' into mater-1.6.0

admin

2019-08-19 626317c580cce67668481e48e10fc4a4fb818678

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

@@ -30,10 +30,10 @@
import com.yeshi.fanli.exception.BindingAccountException;

import com.yeshi.fanli.exception.money.UserMoneyDetailException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;

import com.yeshi.fanli.service.inter.user.BindingAccountService;

import com.yeshi.fanli.service.inter.user.UserAccountBindingHistoryService;

import com.yeshi.fanli.service.inter.user.UserMoneyService;

import com.yeshi.fanli.service.inter.user.UserNotificationService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;

@@ -48,18 +48,14 @@
   private AlipayAccountValidNormalHistoryMapper alipayAccountValidNormalHistoryMapper;

   @Resource

   private UserInfoMapper userInfoMapper;



   @Resource

   private UserNotificationService userNotificationService;



   @Resource

   private UserAccountBindingHistoryService userAccountBindingHistoryService;



   @Resource

   private UserMoneyDetailMapper userMoneyDetailMapper;



   @Resource

   private UserMoneyService userMoneyService;

   @Resource

   private UserMoneyMsgNotificationService userMoneyMsgNotificationService;



   public List<BindingAccount> getBindingAccountByUid(long uid) {

      return bindingAccountMapper.selectByUid(uid);

@@ -143,8 +139,8 @@
      }



      UserInfo userInfo = userInfoMapper.selectByPrimaryKeyForUpdate(uid);

      if (userInfo.getMyHongBao().compareTo(new BigDecimal("0")) <= 0)

         throw new AlipayAccountException(AlipayAccountException.CODE_NO_MONEY, "你的账户目前没有余额，无需绑定提现帐号。");

      if (userInfo.getMyHongBao().compareTo(new BigDecimal("0.1")) < 0)

         throw new AlipayAccountException(AlipayAccountException.CODE_NO_MONEY, "你的账户余额不足0.1元，无需绑定提现帐号。");



      // 需要转账验证

      BigDecimal money = new BigDecimal("0.1");

@@ -172,9 +168,7 @@


      // 扣款

      userMoneyService.subUserMoney(uid, money, userMoneyDetail);



      userNotificationService.alipayAccountValidRight(uid, money, account);



      userMoneyMsgNotificationService.alipayAccountValid(history);

   }



   private void transferAlipayWithVerify(String account, String name)

@@ -217,7 +211,7 @@
               UserAccountBindingHistory.TYPE_PHONE);

         // 手机号更换绑定的7天内不能提现

         if (history != null && !history.getFirst()

               && (System.currentTimeMillis() - history.getCreateTime().getTime()) > 1000 * 60 * 60 * 24 * 7L) {

               && (System.currentTimeMillis() - history.getCreateTime().getTime()) < 1000 * 60 * 60 * 24 * 7L) {

            throw new AlipayAccountException(111, "修改手机号7天内不允许修改支付宝账号");

         }

      }