From 7c03a2c38c499e526f5c4258c35413160d784d04 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期一, 09 三月 2020 16:47:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 201 +++++++++++++++++++++++++++++++++----------------
1 files changed, 134 insertions(+), 67 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 4101586..54c039d 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
@@ -3,6 +3,7 @@
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -13,19 +14,25 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.DateUtil;
import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.NumberUtil;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.order.ESOrder;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.order.CommonOrderException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
+import com.yeshi.fanli.service.inter.order.ESOrderService;
import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.vo.order.CommonOrderVO;
import com.yeshi.fanli.vo.order.OrderCountVO;
@@ -58,7 +65,13 @@
@Resource
private UserCustomSettingsService userCustomSettingsService;
+
+ @Resource
+ private ESOrderService esOrderService;
+
+
+
/**
* 璁㈠崟鍒楄〃
*
@@ -81,15 +94,25 @@
* 鏃堕棿娈碉細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;
+ }
+
+ if (page == null || page < 1)
+ page = 1;
+
+ // 鎼滅储鍐呭銆佽鍗曞彿
+ if (!StringUtil.isNullOrEmpty(orderNo) && VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {
+ searchOrder(acceptData, orderNo, page, uid, out);
return;
}
@@ -113,66 +136,143 @@
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";
}
+ List<Integer> listSource = new ArrayList<>();
+ if (goodsType != null) {
+ listSource.add(goodsType);
+ }
+
try {
// 绛涢�夌粨鏋滈《閮ㄧ粺璁�
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, state, startTime, endTime, listSource);
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, state, startTime, endTime, listSource);
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; // 鏂扮増鏌ヨ鏈湀鍒拌处
+ }
+ }
}
// 鏌ヨ鍒楄〃
List<CommonOrderVO> list = commonOrderService.getOrderByUid(acceptData, page, uid, state, orderType, orderState,
- orderNo, startTime, endTime, dateType, goodsType);
+ orderNo, startTime, endTime, dateType, listSource);
// 缁熻鎬绘暟
long count = commonOrderService.countGroupOrderNoByUid(uid, state, orderType, orderState, orderNo, startTime,
- endTime, dateType, goodsType);
+ endTime, dateType, listSource);
// 鍒ゆ柇鏄惁闇�瑕佹樉绀鸿鍗曟壘鍥炴彁绀� 8绉掑唴璇锋眰3娆¤Е鍙�
String orderFindUrl = null;
if (state ==null && page == 1) {
if (redisManager.frequencyLimit("orderlist-" + acceptData.getDevice(), 8, 4)||count==0L) {
- orderFindUrl = configService.get("order_find_notify_url");
+ orderFindUrl = configService.get(ConfigKeyEnum.orderFindNotifyUrl.getKey());
}
}
JSONObject data = new JSONObject();
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("helpUrl", configService.get(ConfigKeyEnum.orderListHelp.getKey()));
+ 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, "鏌ヨ澶辫触"));
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+
+ /**
+ * 鎼滅储璁㈠崟
+ * @param key
+ * @param out
+ */
+ private void searchOrder(AcceptData acceptData, String key, Integer page, Long uid, PrintWriter out) {
+ try {
+ long count = 0;
+ List<CommonOrderVO> list = null;
+ if (NumberUtil.isNumeric(key.replace("-", ""))) {
+ list = commonOrderService.getOrderByUid(acceptData, page, uid, null, null, null, key, null, null, null, null);
+ }
+
+ if (list == null || list.size() == 0) {
+ List<ESOrder> listES = esOrderService.query(key, uid.toString(), null);
+ if (listES.size() != 0) {
+ list = commonOrderService.searchOrderByUid(page, Constant.PAGE_SIZE, uid, listES);
+ count = commonOrderService.countSearchOrderByUid(uid, listES);
+ }
+ } else {
+ count = list.size();
+ }
+
+ if (list == null) {
+ list = new ArrayList<>();
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("count", count);
+ data.put("result_list", JsonUtil.getApiCommonGson().toJson(list));
+ out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult(1, "鏌ヨ澶辫触"));
e.printStackTrace();
@@ -182,57 +282,21 @@
/**
- * 鏃堕棿杞崲
- *
- * @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;
- }
-
-
- /**
* 鐢ㄦ埛璁㈠崟缁熻
*
* @param acceptData
* @param uid
* 鐢ㄦ埛id
+ * type 绫诲瀷锛�0鍏ㄩ儴銆�1娣樺疂 2浜笢銆佹嫾澶氬
* @param out
*/
@RequestMapping(value = "getOrderCount", method = RequestMethod.POST)
public void getOrderCount(AcceptData acceptData, Long uid, Integer type, PrintWriter out) {
- if (uid == null || type == null) {
+ if (uid == null) {
out.print(JsonUtil.loadFalseResult(1, "璇锋眰鍙傛暟涓嶆纭�"));
return;
}
-
+
try {
UserInfo user = userInfoService.selectByPKey(uid);
if (user == null) {
@@ -248,9 +312,10 @@
}
JSONObject data = new JSONObject();
data.put("userInfo", userInfo);
-
- if (type == 0) {
- OrderCountVO total = commonOrderService.getOrderCount(uid, 1, type);
+
+ List<Integer> listSource = new ArrayList<>();
+ if (type == null || type == 0) {
+ OrderCountVO total = commonOrderService.getOrderCount(uid, null, null);
data.put("total", total.getSelf() + total.getShared() + total.getInvite());
data.put("self", total.getSelf());
data.put("shared", total.getShared());
@@ -260,19 +325,21 @@
data.put("self", 0);
data.put("shared", 0);
data.put("invite", 0);
+
+ listSource.add(type);
}
// 浠婂ぉ
- OrderCountVO today = commonOrderService.getOrderCount(uid, 1, type);
+ OrderCountVO today = commonOrderService.getOrderCount(uid, 1, listSource);
today.setTotal(today.getSelf() + today.getShared() + today.getInvite());
// 鏄ㄥぉ
- OrderCountVO yesterday = commonOrderService.getOrderCount(uid, 2, type);
+ OrderCountVO yesterday = commonOrderService.getOrderCount(uid, 2, listSource);
yesterday.setTotal(yesterday.getSelf() + yesterday.getShared() + yesterday.getInvite());
// 鏈湀
- OrderCountVO thisMonth = commonOrderService.getOrderCount(uid, 3, type);
+ OrderCountVO thisMonth = commonOrderService.getOrderCount(uid, 3, listSource);
thisMonth.setTotal(thisMonth.getSelf() + thisMonth.getShared() + thisMonth.getInvite());
// 涓婃湀
- OrderCountVO lastMonth = commonOrderService.getOrderCount(uid, 4, type);
+ OrderCountVO lastMonth = commonOrderService.getOrderCount(uid, 4, listSource);
lastMonth.setTotal(lastMonth.getSelf() + lastMonth.getShared() + lastMonth.getInvite());
data.put("today", today);
@@ -319,9 +386,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, null);
+ BigDecimal shareMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 2, null);
+ BigDecimal inviteMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 3, null);
JSONObject data = new JSONObject();
data.put("show", show);
--
Gitblit v1.8.0