From 2a93320d3adf8c72ea127df59d0bdd043917dd79 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 十一月 2019 15:12:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyExtraServiceImpl.java |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyExtraServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyExtraServiceImpl.java
index 792461d..41c321d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyExtraServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyExtraServiceImpl.java
@@ -1,20 +1,26 @@
 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 {
 
 	@Resource
 	private UserMoneyExtraMapper userMoneyExtraMapper;
+	
+	@Resource
+	private IntegralTaskRecordService integralTaskRecordService;
 
 	@Override
 	public UserMoneyExtra selectByPrimaryKey(Long uid) {
@@ -31,5 +37,27 @@
 	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);
+		}
+	}
+	
 }

--
Gitblit v1.8.0