From 626d711cb15896055c13fe344eb7fcc824589715 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 19 十二月 2019 15:38:42 +0800
Subject: [PATCH] 帮助中心
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 93 ++++++++++++++++++++++------------------------
1 files changed, 45 insertions(+), 48 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 6a33fbc..18a1faf 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
@@ -81,13 +81,14 @@
* 鏃堕棿娈碉細1-鏈�杩戜笁澶� 2-鏈�杩戜竷澶� 3鏈�杩戝崐鏈� 4鏈湀 5杩戜笁鏈� 6杩戝崐骞�
* @param dateType
* 1-浠婃棩 2-鏄ㄥぉ 3-鏈湀 4-涓婁釜鏈� |
- * @param needCount
+ * @param source
+ * 椤甸潰鏉ユ簮锛歸elfareCore-绂忓埄涓績銆乥onus -濂栭噾缁熻锛堟垜鐨勭晫闈級
* @param out
*/
@RequestMapping(value = "getOrderList", method = RequestMethod.POST)
public void getOrderList(AcceptData acceptData, Integer page, Long uid, Integer state, String type,
Integer orderState, String orderNo, String startTime, String endTime, Integer slotTime,
- Integer dateType, Integer goodsType, PrintWriter out) {
+ Integer dateType, Integer goodsType, String source, PrintWriter out) {
if (uid == null) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
@@ -113,20 +114,48 @@
Integer orderType = null;
if (StringUtil.isNullOrEmpty(type)) {
orderType = null;
- } else if ("0".equalsIgnoreCase(type)){
+ } else if (!"0".equalsIgnoreCase(type)){
orderType = Integer.parseInt(type);
- }
+ }
+ if (goodsType != null && goodsType == 0)
+ goodsType = null;
+
// 绛涢�夋椂闂�
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";
}
@@ -137,17 +166,22 @@
String invalidMoney = "0.00";
if (page == 1) {
BigDecimal predictMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, dateType, orderType, 1,
- orderNo, goodsType, startTime, endTime);
+ orderNo, state, goodsType, startTime, endTime);
if (predictMoney != null)
validMoney = predictMoney.setScale(2, BigDecimal.ROUND_DOWN).toString();
BigDecimal postSaleMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, dateType, orderType, 2,
- orderNo, goodsType, startTime, endTime);
+ orderNo, state, 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; // 鏂扮増鏌ヨ鏈湀鍒拌处
+ }
+ }
}
// 鏌ヨ鍒楄〃
@@ -181,43 +215,6 @@
}
}
-
- /**
- * 鏃堕棿杞崲
- *
- * @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;
- }
-
/**
* 鐢ㄦ埛璁㈠崟缁熻
--
Gitblit v1.8.0