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

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackBalanceServiceImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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 e6ef61b..7da0ce9 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
@@ -36,8 +36,7 @@
 		
 		RedPackBalance redPackBalance = redPackBalanceMapper.selectByPrimaryKey(uid);
 		if (redPackBalance != null)
-			return redPackBalance.getMoney();
-		
+			return redPackBalance.getMoney();
 		return new BigDecimal(0);
 	}
 
@@ -50,6 +49,7 @@
 			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);
@@ -71,6 +71,7 @@
 			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);

--
Gitblit v1.8.0