From 2147d023563a7c9d05d97547c00d6b0162c0644c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 09 十一月 2020 18:37:24 +0800
Subject: [PATCH] 刷单风险规则优化

---
 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java
index 62627ec..6f4623f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java
@@ -245,18 +245,18 @@
 			String invalidMoney = "0.00";
 			if (page == 1) {
 				BigDecimal predictMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, dateType, orderType, 1,
-						orderNo, state, startTime, endTime, listSource,false);
+						orderNo, state, startTime, endTime, listSource);
 				if (predictMoney != null)
 					validMoney = predictMoney.setScale(2, BigDecimal.ROUND_DOWN).toString();
 
 				BigDecimal postSaleMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, dateType, orderType, 2,
-						orderNo, state, startTime, endTime, listSource,false);
+						orderNo, state, startTime, endTime, listSource);
 				if (postSaleMoney != null)
 					invalidMoney = postSaleMoney.setScale(2, BigDecimal.ROUND_DOWN).toString();
 
 				if (orderType != null && dateType != null && dateType == 4) {
 					if (orderType == 1) {
-						dateType = 6; // 杩斿埄璁㈠崟鏈夋晥
+						dateType = 6; // 杩斿埄璁㈠崟鏈夋晥鐨�
 					} else {
 						dateType = 5; // 鏂扮増鏌ヨ鏈湀鍒拌处
 					}
@@ -274,14 +274,14 @@
 			String orderFindUrl = null;
 			if (state == null && page == 1) {
 				if (redisManager.frequencyLimit("orderlist-" + acceptData.getDevice(), 8, 4) || count == 0L) {
-					orderFindUrl = configService.get(ConfigKeyEnum.orderFindNotifyUrl.getKey());
+					orderFindUrl = configService.getValue(ConfigKeyEnum.orderFindNotifyUrl.getKey(),acceptData.getSystem());
 				}
 			}
 
 			JSONObject data = new JSONObject();
 			data.put("count", count);
 			data.put("list", JsonUtil.getApiCommonGson().toJson(list));
-			data.put("helpUrl", configService.get(ConfigKeyEnum.orderListHelp.getKey()));
+			data.put("helpUrl", configService.getValue(ConfigKeyEnum.orderListHelp.getKey(),acceptData.getSystem()));
 			data.put("validMoney", "楼 " + validMoney);
 			data.put("invalidMoney", "楼 " + invalidMoney);
 			data.put("findOrderHelpUrl", orderFindUrl);

--
Gitblit v1.8.0