From 3e236d3f70dc55de0357b5ae19e1e3dd1682374f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 08 一月 2020 14:01:43 +0800
Subject: [PATCH] 小程序动态修改

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
index 67baaff..7d177bd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
@@ -171,7 +171,13 @@
 		} else if (goodsType != null && goodsType == 0) {
 			goodsType = null; // 鎵�鏈夊钩鍙拌鍗�
 		}
-
+		
+		List<Integer> listSource = new ArrayList<>();
+		if (goodsType != null) {
+			listSource.add(goodsType);
+		}
+		
+		
 		try {
 			if (slotTime != null) {
 				SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
@@ -187,13 +193,7 @@
 		}
 
 		String orderFindUrl = null;
-		// 鍒ゆ柇鏄惁闇�瑕佹樉绀鸿鍗曟壘鍥炴彁绀�
-		if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion()))
-			if (state ==null && page == 1) {
-				if (redisManager.frequencyLimit("orderlist-" + acceptData.getDevice(), 8, 4)) {// 8绉掑唴璇锋眰3娆¤Е鍙�
-					orderFindUrl = configService.get("order_find_notify_url");
-				}
-			}
+		
 
 		try {
 			long count = 0;
@@ -205,12 +205,12 @@
 
 			// 鏌ヨ鍒楄〃
 			List<CommonOrderVO> list = commonOrderService.getOrderByUid(acceptData, page, uid, state, type, orderState,
-					orderNo, startTime, endTime, dateType, goodsType);
+					orderNo, startTime, endTime, dateType, listSource);
 
 			if (list != null && list.size() > 0) {
 				// 缁熻鎬绘暟
 				count = commonOrderService.countGroupOrderNoByUid(uid, state, type, orderState, orderNo, startTime,
-						endTime, dateType, goodsType);
+						endTime, dateType, listSource);
 			}
 
 			// 闇�瑕佺粺璁$瓫閫変俊鎭� 锛氭湭澶辨晥鐨勬�婚噾棰� 浠ュ強璁㈠崟
@@ -238,6 +238,14 @@
 			if (todayMoney == null) {
 				todayMoney = new BigDecimal(0.00);
 			}
+			
+			// 鍒ゆ柇鏄惁闇�瑕佹樉绀鸿鍗曟壘鍥炴彁绀�
+			if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion()))
+				if (state ==null && page == 1) {
+					if (redisManager.frequencyLimit("orderlist-" + acceptData.getDevice(), 8, 4)||count==0L) {// 8绉掑唴璇锋眰3娆¤Е鍙�
+						orderFindUrl = configService.get("order_find_notify_url");
+					}
+				}
 
 			JSONObject data = new JSONObject();
 			data.put("count", count);

--
Gitblit v1.8.0