From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 d1daa0c..67baaff 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
@@ -186,11 +186,12 @@
endTime += " 23:59:59";
}
+ String orderFindUrl = null;
// 鍒ゆ柇鏄惁闇�瑕佹樉绀鸿鍗曟壘鍥炴彁绀�
if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion()))
- if (state != null && state == 0 && page == 1) {
- if (redisManager.frequencyLimit("orderlist-" + acceptData.getDevice(), 15, 3)) {// 15绉掑唴璇锋眰3娆¤Е鍙�
- // TODO 鏄剧ず璁㈠崟鎵惧洖鎻愰啋
+ if (state ==null && page == 1) {
+ if (redisManager.frequencyLimit("orderlist-" + acceptData.getDevice(), 8, 4)) {// 8绉掑唴璇锋眰3娆¤Е鍙�
+ orderFindUrl = configService.get("order_find_notify_url");
}
}
@@ -255,6 +256,8 @@
data.put("totalValid", totalValid); // 鏈夋晥鏁伴噺
data.put("totalProces", totalProces); // 缁存潈鏁伴噺
data.put("totalInvite", totalInvite); // 澶辨晥鏁伴噺
+ if (orderFindUrl != null)
+ data.put("findOrderHelpUrl", orderFindUrl);
out.print(JsonUtil.loadTrueResult(data));
} catch (CommonOrderException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
--
Gitblit v1.8.0