From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 22 一月 2019 15:58:24 +0800
Subject: [PATCH] 邀请码添加返回状态
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 39 +++++++++++++++------------------------
1 files changed, 15 insertions(+), 24 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 6379291..4be4283 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
@@ -91,6 +91,9 @@
e.printStackTrace();
}
+ if (endTime != null && endTime.trim().length() > 0) {
+ endTime += " 23:59:59";
+ }
try {
long count = 0;
@@ -99,6 +102,7 @@
int totalInvite = 0;
long todayTotal = 0;
BigDecimal todayMoney = null;
+
// 鏌ヨ鍒楄〃
List<CommonOrderVO> list = commonOrderService.getOrderByUid(page, uid, state, type, orderState,
@@ -113,20 +117,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 +318,6 @@
Object totalmoney = shareMap.get("totalmoney");
if (totalmoney != null) {
sharemoney = (BigDecimal) totalmoney;
- sharemoney = sharemoney.setScale(2, BigDecimal.ROUND_DOWN);
}
}
@@ -339,17 +331,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));
@@ -373,22 +364,22 @@
switch (slotTime) {
case 1: // 鏈�杩戜笁澶�
- startTime = DateUtil.reduceDay(3, endTime);
+ startTime = DateUtil.reduceDay(2, endTime);
break;
case 2: // 鏈�杩戜竷澶�
- startTime = DateUtil.reduceDay(7, endTime);
+ startTime = DateUtil.reduceDay(6, endTime);
break;
case 3: // 鏈�杩�15澶� 锛堝崐鏈堬級
- startTime = DateUtil.reduceDay(15, endTime);
+ startTime = DateUtil.reduceDay(14, endTime);
break;
case 4: // 鏈�杩戜笁鍗佸ぉ 锛堟湰鏈堬級
- startTime = DateUtil.reduceDay(30, endTime);
+ startTime = DateUtil.reduceDay(29, endTime);
break;
case 5: // 鏈�杩戜節鍗佸ぉ锛堣繎涓夋湀锛�
- startTime = DateUtil.reduceDay(3*30, endTime);
+ startTime = DateUtil.reduceDay(3*30-1, endTime);
break;
case 6: // 鏈�杩戜竴鐧惧叓鍗佸ぉ锛堣繎鍗婂勾锛�
- startTime = DateUtil.reduceDay(6*30, endTime);
+ startTime = DateUtil.reduceDay(6*30-1, endTime);
break;
default:
break;
--
Gitblit v1.8.0