From 0df58ff660b537fd4e646a56e90204ee99a1a7a9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 14 一月 2019 10:35:49 +0800
Subject: [PATCH] 资金校验BUG修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 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 0e67d3c..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
@@ -83,9 +83,9 @@
try {
if (slotTime != null) {
- SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
- endTime= sd.format(new Date());
- startTime = convertDate(slotTime, endTime);
+ SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
+ endTime= sd.format(new Date());
+ startTime = convertDate(slotTime, endTime);
}
} catch (Exception e) {
e.printStackTrace();
@@ -116,6 +116,7 @@
todayMoney = commonOrderService.countBonusOrderMoney(uid, type, dateType, startTime, endTime);
todayTotal = commonOrderService.countBonusOrderNumber(uid, type, dateType, startTime, endTime);
+
// 缁熻鏈夋晥鐨勮鍗曟暟閲� 銆� 澶辨晥璁㈠崟鏁伴噺 銆佺淮鏉冭鍗曟暟閲�
Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type,
@@ -313,7 +314,6 @@
Object totalmoney = shareMap.get("totalmoney");
if (totalmoney != null) {
sharemoney = (BigDecimal) totalmoney;
- sharemoney = sharemoney.setScale(2, BigDecimal.ROUND_DOWN);
}
}
@@ -327,17 +327,16 @@
Object totalmoney = inviteMap.get("totalmoney");
if (totalmoney != null) {
- sharemoney = (BigDecimal) totalmoney;
- inviteMoney = sharemoney.setScale(2, BigDecimal.ROUND_DOWN);
+ inviteMoney = (BigDecimal) totalmoney;
}
}
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