From 395cd4c4caf01e1b3ad134834e5c1db284b59074 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 11 四月 2020 18:18:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyExtraServiceImpl.java | 28 +---------------------------
1 files changed, 1 insertions(+), 27 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 41c321d..ee58255 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,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);
- }
- }
+
}
--
Gitblit v1.8.0