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,7 +1,6 @@
package com.yeshi.fanli.service.impl.money;



import java.math.BigDecimal;

import java.util.Date;

import java.util.List;



import javax.annotation.Resource;



@@ -10,13 +9,13 @@
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.util.MoneyBigDecimalUtil;



@Service

public class UserMoneyExtraServiceImpl implements UserMoneyExtraService {



   @Resource

   private UserMoneyExtraMapper userMoneyExtraMapper;

	


   @Override

   public UserMoneyExtra selectByPrimaryKey(Long uid) {

@@ -28,40 +27,11 @@
      userMoneyExtraMapper.updateByPrimaryKeySelective(record);   

   }

   

	
		
   @Override

   public void addTaoLiJin(Long uid, BigDecimal money, boolean canSelf) {

      if (uid == null || money == null) {

         return;

      }

		
      UserMoneyExtra record = new UserMoneyExtra();

      record.setUid(uid);

		
      UserMoneyExtra existExtra = userMoneyExtraMapper.selectByPrimaryKey(record.getUid());

      if (existExtra == null) {

         record.setTlj(money);

			
         if (canSelf) {

            record.setTljSelf(money);

         } else {

            record.setTljSelf(new BigDecimal(0));

         }

			
         record.setCreateTime(new Date());

         record.setUpdateTime(new Date());

         userMoneyExtraMapper.insertSelective(record);

      } else {

         BigDecimal tlj = existExtra.getTlj();

         record.setTlj(MoneyBigDecimalUtil.add(tlj, money));

			
         if (canSelf) {

            BigDecimal tljSelf = existExtra.getTljSelf();

            record.setTljSelf(MoneyBigDecimalUtil.add(tljSelf, money));

         }

			
         record.setUpdateTime(new Date());

         userMoneyExtraMapper.updateByPrimaryKeySelective(record);	
      }

   public List<UserMoneyExtra> listValid(int page, int count) {

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

   }

	 
	
}