Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyExtraServiceImpl.java

@@ -1,17 +1,14 @@
package com.yeshi.fanli.service.impl.money;



import java.math.BigDecimal;

import java.util.List;



import javax.annotation.Resource;



import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



import com.yeshi.fanli.dao.mybatis.user.UserMoneyExtraMapper;

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

import com.yeshi.fanli.service.inter.money.UserMoneyExtraService;

import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRecordService;



@Service

public class UserMoneyExtraServiceImpl implements UserMoneyExtraService {

@@ -19,8 +16,6 @@
   @Resource

   private UserMoneyExtraMapper userMoneyExtraMapper;

   

   @Resource

   private IntegralTaskRecordService integralTaskRecordService;



   @Override

   public UserMoneyExtra selectByPrimaryKey(Long uid) {

@@ -37,27 +32,6 @@
   public List<UserMoneyExtra> listValid(int page, int count) {

      return userMoneyExtraMapper.listValid((page-1) * count, count);

   }

	
   @Override

   @Transactional(rollbackFor = Exception.class)

   public void taoLiJinExchange(int page, int count) {

      List<UserMoneyExtra> listValid = userMoneyExtraMapper.listValid((page-1) * count, count);

      if (listValid == null || listValid.isEmpty())

         return;

		
      BigDecimal zero = new BigDecimal(0);

      for (UserMoneyExtra moneyExtra: listValid) {

         BigDecimal tlj = moneyExtra.getTlj();

         BigDecimal tljSelf = moneyExtra.getTljSelf();

         if (tlj == null || tlj.compareTo(zero) <= 0 || tljSelf == null || tljSelf.intValue() <= 0)

            continue;

			
         integralTaskRecordService.taoLiJinExchange(moneyExtra.getUid(), tljSelf.intValue(), tlj);

			
         moneyExtra.setTlj(zero);

         moneyExtra.setTljSelf(zero);

         userMoneyExtraMapper.updateByPrimaryKeySelective(moneyExtra);

      }

   }

	 
   

}