From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyExtraServiceImpl.java | 44 +++++++-------------------------------------
1 files changed, 7 insertions(+), 37 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 38f3d5e..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,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);
}
+
+
}
--
Gitblit v1.8.0