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/redpack/RedPackBalanceServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackBalanceServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackBalanceServiceImpl.java
index 7da0ce9..e8cc4a8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackBalanceServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackBalanceServiceImpl.java
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
import javax.annotation.Resource;
@@ -14,6 +15,7 @@
import com.yeshi.fanli.exception.redpack.RedPackBalanceException;
import com.yeshi.fanli.service.inter.redpack.RedPackBalanceService;
import com.yeshi.fanli.service.inter.redpack.RedPackDetailService;
+import com.yeshi.fanli.vo.redpack.RedPackBalanceVO;
@Service
public class RedPackBalanceServiceImpl implements RedPackBalanceService {
@@ -30,33 +32,16 @@
}
@Override
- public BigDecimal getBalance(Long uid) {
+ public BigDecimal getBalance(Long uid){
if (uid == null || uid == 0)
return new BigDecimal(0);
RedPackBalance redPackBalance = redPackBalanceMapper.selectByPrimaryKey(uid);
- if (redPackBalance != null)
+ if (redPackBalance != null && redPackBalance.getMoney() != null)
return redPackBalance.getMoney();
return new BigDecimal(0);
}
- @Override
- public void addRedPack(Long uid, BigDecimal money) {
- if (uid == null || uid == 0 || money == null)
- return;
- RedPackBalance redPackBalance = redPackBalanceMapper.selectForUpdate(uid);
- if (redPackBalance == null) {
- redPackBalance = new RedPackBalance();
- redPackBalance.setId(uid);
- redPackBalance.setMoney(money);
- redPackBalance.setState(RedPackBalance.STATE_INIT);
- redPackBalance.setCreateTime(new Date());
- redPackBalance.setUpdateTime(new Date());
- redPackBalanceMapper.insertSelective(redPackBalance);
- } else {
- redPackBalanceMapper.addRedPack(uid, money);
- }
- }
@Override
@Transactional(rollbackFor = Exception.class)
@@ -71,7 +56,6 @@
redPackBalance = new RedPackBalance();
redPackBalance.setId(uid);
redPackBalance.setMoney(money);
- redPackBalance.setState(RedPackBalance.STATE_INIT);
redPackBalance.setCreateTime(new Date());
redPackBalance.setUpdateTime(new Date());
redPackBalanceMapper.insertSelective(redPackBalance);
@@ -94,8 +78,37 @@
if (balance.getMoney().compareTo(money) < 0)
throw new RedPackBalanceException(2, "绾㈠寘浣欓涓嶈冻");
-
+
// 鍑忓皯绾㈠寘
redPackBalanceMapper.subRedPack(uid, money);
}
+
+
+ @Override
+ public RedPackBalance selectForUpdate(Long uid) {
+ return redPackBalanceMapper.selectForUpdate(uid);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void resetRedPack(Long uid, RedPackDetail detail) throws RedPackBalanceException {
+ if (uid == null || uid == 0 || detail == null)
+ throw new RedPackBalanceException(1, "鍙傛暟浼犻�掍笉瀹屾暣");
+ // 鍔犲叆鏄庣粏
+ redPackDetailService.insertSelective(detail);
+ // 閲嶇疆
+ redPackBalanceMapper.resetRedPack(uid);
+ }
+
+
+ @Override
+ public List<RedPackBalanceVO> query(Integer start, Integer count, String key, Integer state,Integer order){
+ return redPackBalanceMapper.query(start, count, key, state,order);
+ }
+
+ @Override
+ public long count(String key, Integer state){
+ return redPackBalanceMapper.count(key, state);
+ }
+
}
--
Gitblit v1.8.0