From 42b206d89cf0a6f4c2bb2567d867d7c479d6edf1 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 12 一月 2019 15:30:06 +0800
Subject: [PATCH] 后台订单、用户信息调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
index ccde44c..c988e76 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
@@ -113,20 +113,9 @@
// 闇�瑕佺粺璁＄瓫閫変俊鎭� 锛氭湭澶辨晥鐨勬�婚噾棰� 浠ュ強璁㈠崟
if (needCount && page == 1) {
- Map<String, Object> shareMap = commonOrderService.countBonusOrderMoneyAndNumber(uid, type,
- dateType, startTime, endTime);
+ todayMoney = commonOrderService.countBonusOrderMoney(uid, type, dateType, startTime, endTime);
- if (shareMap != null) {
- Object totalNum = shareMap.get("totalNum");
- if (totalNum != null) {
- todayTotal = (long) totalNum;
- }
-
- Object totalmoney = shareMap.get("totalmoney");
- if (totalmoney != null) {
- todayMoney = (BigDecimal) totalmoney;
- }
- }
+ todayTotal = commonOrderService.countBonusOrderNumber(uid, type, dateType, startTime, endTime);
// 缁熻鏈夋晥鐨勮鍗曟暟閲� 銆� 澶辨晥璁㈠崟鏁伴噺 銆佺淮鏉冭鍗曟暟閲�
@@ -325,7 +314,6 @@
Object totalmoney = shareMap.get("totalmoney");
if (totalmoney != null) {
sharemoney = (BigDecimal) totalmoney;
- sharemoney = sharemoney.setScale(2, BigDecimal.ROUND_DOWN);
}
}
@@ -340,16 +328,15 @@
Object totalmoney = inviteMap.get("totalmoney");
if (totalmoney != null) {
inviteMoney = (BigDecimal) totalmoney;
- inviteMoney = inviteMoney.setScale(2, BigDecimal.ROUND_DOWN);
}
}
JSONObject data = new JSONObject();
data.put("shareCount", shareCount);
- data.put("sharemoney", sharemoney);
+ data.put("sharemoney", sharemoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
data.put("inviteCount", inviteCount);
- data.put("inviteMoney", inviteMoney);
+ data.put("inviteMoney", inviteMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
data.put("showTiCheng", hongBaoV2CountService.getTotalTiChengCount(uid) > 0);
out.print(JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0