From 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 15:33:00 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 100 +++++++++++++++++++++++--------------------------
1 files changed, 47 insertions(+), 53 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
index 6b572d7..2568604 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
@@ -113,20 +113,45 @@
Integer orderType = null;
if (StringUtil.isNullOrEmpty(type)) {
orderType = null;
- } else if ("0".equalsIgnoreCase(type)){
+ } else if (!"0".equalsIgnoreCase(type)){
orderType = Integer.parseInt(type);
- }
+ }
// 绛涢�夋椂闂�
if (slotTime != null) {
- SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
try {
- endTime = sd.format(new Date());
- startTime = convertDate(slotTime, endTime);
+ SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
+
+ switch (slotTime) {
+ case 1: // 鏈�杩戜笁澶�
+ endTime = sd.format(new Date());
+ startTime = DateUtil.reduceDay(2, endTime);
+ break;
+ case 2: // 鏈�杩戜竷澶�
+ endTime = sd.format(new Date());
+ startTime = DateUtil.reduceDay(6, endTime);
+ break;
+ case 3: // 鏈�杩�15澶� 锛堝崐鏈堬級
+ endTime = sd.format(new Date());
+ startTime = DateUtil.reduceDay(14, endTime);
+ break;
+ case 4: // 鏈�杩戜笁鍗佸ぉ 锛堟湰鏈堬級
+ dateType = 10;
+ break;
+ case 5: // 鏈�杩戜節鍗佸ぉ锛堣繎涓夋湀锛�
+ dateType = 11;
+ break;
+ case 6: // 鏈�杩戜竴鐧惧叓鍗佸ぉ锛堣繎鍗婂勾锛�
+ dateType = 12;
+ break;
+ default:
+ break;
+ }
} catch (Exception e) {
e.printStackTrace();
}
}
+
if (endTime != null && endTime.trim().length() > 0) {
endTime += " 23:59:59";
}
@@ -135,17 +160,24 @@
// 绛涢�夌粨鏋滈《閮ㄧ粺璁�
String validMoney = "0.00";
String invalidMoney = "0.00";
- if (dateType != null) {
- BigDecimal predictMoney = hongBaoV2CountService.getRewardMoneyByDate(uid, dateType, orderType, 1);
+ if (page == 1) {
+ BigDecimal predictMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, dateType, orderType, 1,
+ orderNo, goodsType, startTime, endTime);
if (predictMoney != null)
validMoney = predictMoney.setScale(2, BigDecimal.ROUND_DOWN).toString();
- BigDecimal postSaleMoney = hongBaoV2CountService.getRewardMoneyByDate(uid, dateType, orderType, 2);
+ BigDecimal postSaleMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, dateType, orderType, 2,
+ orderNo, goodsType, startTime, endTime);
if (postSaleMoney != null)
invalidMoney = postSaleMoney.setScale(2, BigDecimal.ROUND_DOWN).toString();
- if (dateType == 4)
- dateType = 5; // 鏂扮増鏌ヨ鏈湀鍒拌处
+ if (orderType != null && dateType != null && dateType == 4) {
+ if (orderType == 1) {
+ dateType = 6; // 杩斿埄璁㈠崟鏈夋晥
+ } else {
+ dateType = 5; // 鏂扮増鏌ヨ鏈湀鍒拌处
+ }
+ }
}
// 鏌ヨ鍒楄〃
@@ -167,56 +199,18 @@
data.put("count", count);
data.put("result_list", JsonUtil.getApiCommonGson().toJson(list));
data.put("helpUrl", configService.get("order_list_help"));
- data.put("validMoney", validMoney);
- data.put("invalidMoney", invalidMoney);
+ data.put("validMoney", "楼 " + validMoney);
+ data.put("invalidMoney", "楼 " + invalidMoney);
data.put("findOrderHelpUrl", orderFindUrl);
out.print(JsonUtil.loadTrueResult(data));
} catch (CommonOrderException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult(1, "鏌ヨ澶辫触"));
- e.printStackTrace();
LogHelper.errorDetailInfo(e);
}
}
-
- /**
- * 鏃堕棿杞崲
- *
- * @param slotTime
- * @param startTime
- * @return
- * @throws Exception
- */
- private String convertDate(Integer slotTime, String endTime) throws Exception {
- String startTime = null;
-
- switch (slotTime) {
- case 1: // 鏈�杩戜笁澶�
- startTime = DateUtil.reduceDay(2, endTime);
- break;
- case 2: // 鏈�杩戜竷澶�
- startTime = DateUtil.reduceDay(6, endTime);
- break;
- case 3: // 鏈�杩�15澶� 锛堝崐鏈堬級
- startTime = DateUtil.reduceDay(14, endTime);
- break;
- case 4: // 鏈�杩戜笁鍗佸ぉ 锛堟湰鏈堬級
- startTime = DateUtil.reduceDay(29, endTime);
- break;
- case 5: // 鏈�杩戜節鍗佸ぉ锛堣繎涓夋湀锛�
- startTime = DateUtil.reduceDay(3 * 30 - 1, endTime);
- break;
- case 6: // 鏈�杩戜竴鐧惧叓鍗佸ぉ锛堣繎鍗婂勾锛�
- startTime = DateUtil.reduceDay(6 * 30 - 1, endTime);
- break;
- default:
- break;
- }
- return startTime;
- }
-
/**
* 鐢ㄦ埛璁㈠崟缁熻
@@ -319,9 +313,9 @@
show = hongBaoV2CountService.getHongBaoCount(uid, null) > 0;
}
- BigDecimal selfMoney = hongBaoV2CountService.getRewardMoneyByDate(uid, dateType, 1, null);
- BigDecimal shareMoney = hongBaoV2CountService.getRewardMoneyByDate(uid, dateType, 2, null);
- BigDecimal inviteMoney = hongBaoV2CountService.getRewardMoneyByDate(uid, dateType, 3, null);
+ BigDecimal selfMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 1);
+ BigDecimal shareMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 2);
+ BigDecimal inviteMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 3);
JSONObject data = new JSONObject();
data.put("show", show);
--
Gitblit v1.8.0