From a4e938874dbc0376125324cb170f5885f88da8a7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 11 十一月 2019 16:45:51 +0800
Subject: [PATCH] 板栗商城退款修改,获取用户的会员运营ID与渠道ID修改

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/RedPackAdminController.java |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/RedPackAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/RedPackAdminController.java
index 9203424..32504af 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/RedPackAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/RedPackAdminController.java
@@ -120,21 +120,19 @@
 		Long uid = exchange.getUid();
 		BigDecimal balance = redPackBalanceService.getBalance(uid);
 		UserInfo userInfo = userInfoService.selectByPKey(uid);
-		List<Long> listCount = redPackExchangeService.countState(uid);
-		List<BigDecimal> listMoney = redPackExchangeService.countMoneyState(uid);
 		
 		JSONObject data = new JSONObject();
 		data.put("exchange", exchange);
 		data.put("userInfo", userInfo);
 		
-		data.put("countInit", listCount.get(0));
-		data.put("countSucceed", listCount.get(1));
-		data.put("countReject",  listCount.get(2));
+		data.put("countInit", redPackExchangeService.countByUidAndState(uid, RedPackExchange.STATE_INIT));
+		data.put("countSucceed", redPackExchangeService.countByUidAndState(uid, RedPackExchange.STATE_SUCCESS));
+		data.put("countReject", redPackExchangeService.countByUidAndState(uid, RedPackExchange.STATE_REJECT));
 		
 		data.put("balance", balance);
-		data.put("moneyInit", listMoney.get(0));
-		data.put("moneySucceed", listMoney.get(1));
-		data.put("moneyReject",  listMoney.get(2));
+		data.put("moneyInit", redPackExchangeService.countMoneyByUidAndState(uid,RedPackExchange.STATE_INIT));
+		data.put("moneySucceed", redPackExchangeService.countMoneyByUidAndState(uid,RedPackExchange.STATE_SUCCESS));
+		data.put("moneyReject",  redPackExchangeService.countMoneyByUidAndState(uid,RedPackExchange.STATE_REJECT));
 		JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
 	}
 

--
Gitblit v1.8.0