From 0612e7e4104f41c3f8b683073e08cdbb65dad44a Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 29 十月 2019 13:58:20 +0800
Subject: [PATCH] 红包相关
---
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