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/service/impl/order/CommonOrderServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index 6e21610..84efc51 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -1489,16 +1489,16 @@
@Override
public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state,
- Integer type, Integer orderState, String startTime, String endTime, Integer source, List<Long> listShopId,
+ List<Integer> typeList, Integer orderState, String startTime, String endTime, Integer source, List<Long> listShopId,
List<Long> listGoodsId, Date minTime, BigDecimal money, BigDecimal payment, SystemEnum system) throws CommonOrderException {
List<CommonOrderVO> list = null;
if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 鎼滅储妗嗘棤鍊兼垨鑰呮寜璁㈠崟鍙锋悳绱㈡椂閮藉彧鎼滅储涓昏鍗�
- list = commonOrderMapper.listQueryWithNoChild(start, count, keyType, key, state, type, orderState,
+ list = commonOrderMapper.listQueryWithNoChild(start, count, keyType, key, state, typeList, orderState,
startTime, endTime, source, payment, system);
} else {
- list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState, startTime, endTime,
+ list = commonOrderMapper.listQuery(start, count, keyType, key, state, typeList, orderState, startTime, endTime,
source, listShopId, listGoodsId, minTime, money, payment, system);
}
@@ -1684,14 +1684,14 @@
}
@Override
- public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
+ public long countQuery(Integer keyType, String key, Integer state, List<Integer> typeList, Integer orderState,
String startTime, String endTime, Integer source, List<Long> listShopId, List<Long> listGoodsId,
Date minTime, BigDecimal money, BigDecimal payment, SystemEnum system) throws CommonOrderException {
if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 鎼滅储妗嗘棤鍊兼垨鑰呮寜璁㈠崟鍙锋悳绱㈡椂閮藉彧鎼滅储涓昏鍗�
- return commonOrderMapper.countQueryWithNoChild(keyType, key, state, type, orderState, startTime, endTime,
+ return commonOrderMapper.countQueryWithNoChild(keyType, key, state, typeList, orderState, startTime, endTime,
source, payment, system);
} else {
- return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime, source,
+ return commonOrderMapper.countQuery(keyType, key, state, typeList, orderState, startTime, endTime, source,
listShopId, listGoodsId, minTime, money, payment, system);
}
}
@@ -2228,8 +2228,8 @@
/* 璁㈠崟鐘舵�� 杞崲澶勭悊 */
String orderStateContent = "";
- if(!StringUtil.isNullOrEmpty(order.getOrderStateDesc()))
- orderStateContent=order.getOrderStateDesc();
+ if (!StringUtil.isNullOrEmpty(order.getOrderStateDesc()))
+ orderStateContent = order.getOrderStateDesc();
else {
if (CommonOrder.STATE_FK == orderState) {
orderStateContent = "宸蹭粯娆�";
--
Gitblit v1.8.0