From 6dfb4599cee5c19f4d1c5cc344a4f84de1c1633c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 16 十二月 2019 15:26:57 +0800
Subject: [PATCH] 冲突信息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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..060328c 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
@@ -187,13 +187,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;
@@ -238,6 +232,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