Merge remote-tracking branch 'origin/master'

Administrator

2018-12-18 d146e7bca73c7605af6b718b5df0b757e0034f0e

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

@@ -39,15 +39,18 @@
import com.yeshi.fanli.entity.bus.user.Extract;

import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;

import com.yeshi.fanli.entity.bus.user.ExtractRecord;

import com.yeshi.fanli.entity.bus.user.HongBao;

import com.yeshi.fanli.entity.bus.user.MoneyRecord;

import com.yeshi.fanli.entity.bus.user.PayInfo;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.exception.ExtractException;

import com.yeshi.fanli.exception.NotExistObjectException;

import com.yeshi.fanli.exception.ObjectStateException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SystemConfigService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.push.PushService;

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

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

@@ -132,7 +135,7 @@
   private SystemMapper systemMapper;



   @Resource

   private HongBaoMapper hongBaoService;

   private HongBaoMapper hongBaoMapper;



   @Resource

   private PushService pushService;

@@ -502,8 +505,13 @@
   }



   @Override

   public List<Integer> checkExtract(String uid) {

      return extractMapper.checkExtract(uid);

   public void checkExtract(String uid) throws ExtractException {

      int count = hongBaoMapper.getCountByUidAndState(Long.parseLong(uid), HongBao.STATE_YILINGQU);

      if (count == 0)

         throw new ExtractException(1, "没有已到账的红包");

      List<Integer> list = extractMapper.checkExtract(uid);

      if (list != null && list.size() > 0 && list.get(0) == 0)

         throw new ExtractException(2, "结算资金异常");

   }



   @Override