From c8f11c229b87d1652b6da0b15576c166cd51eb8b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 一月 2020 14:25:22 +0800
Subject: [PATCH] 首页悬浮图mapperbug修改，增加商品详情中的比例展示
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 63 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 4 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 2568604..486dc1d 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;
@@ -16,16 +17,20 @@
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.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 +63,13 @@
@Resource
private UserCustomSettingsService userCustomSettingsService;
+
+ @Resource
+ private ESOrderService esOrderService;
+
+
+
/**
* 璁㈠崟鍒楄〃
*
@@ -81,15 +92,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(orderNo, page, uid, out);
return;
}
@@ -117,6 +138,9 @@
orderType = Integer.parseInt(type);
}
+ if (goodsType != null && goodsType == 0)
+ goodsType = null;
+
// 绛涢�夋椂闂�
if (slotTime != null) {
try {
@@ -162,12 +186,12 @@
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();
@@ -210,6 +234,37 @@
LogHelper.errorDetailInfo(e);
}
}
+
+ /**
+ * 鎼滅储璁㈠崟
+ * @param key
+ * @param out
+ */
+ private void searchOrder(String key, Integer page, Long uid, PrintWriter out) {
+ try {
+ long count = 0;
+ List<CommonOrderVO> list = null;
+ List<ESOrder> listES = esOrderService.query(key, uid.toString());
+
+ if (listES.size() != 0) {
+ list = commonOrderService.searchOrderByUid(page, Constant.PAGE_SIZE, uid, listES);
+ count = commonOrderService.countSearchOrderByUid(uid, listES);
+ }
+
+ 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();
+ LogHelper.errorDetailInfo(e);
+ }
+ }
/**
--
Gitblit v1.8.0