From dcbc8878d19f4eab1639771e3d64215379b9dc88 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 十一月 2019 15:12:03 +0800
Subject: [PATCH] 京东违规订单处理
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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 af23886..861558c 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
@@ -1061,8 +1061,8 @@
commonOrder.getTradeId(), new Date(), commonOrder.getSourceType()));
return new CommonOrderAddResultDTO(commonOrder, CommonOrderAddResultDTO.TYPE_ADD);
} else {// 淇敼
- // 宸茬粡缁撶畻锛屽凡缁忓け鏁堬紝鐘舵�佹湭鏀瑰彉鐨勮鍗曚笉澶勭悊
- if (oldCommonOrder.getState() == CommonOrder.STATE_JS || oldCommonOrder.getState() == CommonOrder.STATE_SX
+ // 闈炰含涓滃凡缁忕粨绠楋紝宸茬粡澶辨晥锛岀姸鎬佹湭鏀瑰彉鐨勮鍗曚笉澶勭悊
+ if ((oldCommonOrder.getState() == CommonOrder.STATE_JS&&oldCommonOrder.getSourceType()!=Constant.SOURCE_TYPE_JD) || oldCommonOrder.getState() == CommonOrder.STATE_SX
|| oldCommonOrder.getState() == CommonOrder.STATE_WQ
|| (oldCommonOrder.getState().intValue() == commonOrder.getState())) {
return new CommonOrderAddResultDTO(oldCommonOrder, CommonOrderAddResultDTO.TYPE_NOUPDATE);
@@ -1177,7 +1177,8 @@
@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)
+ Integer type, Integer orderState, String startTime, String endTime, Integer source,List<Long> listShopId,
+ List<Long> listGoodsId, Date minTime, BigDecimal money)
throws CommonOrderException {
List<CommonOrderVO> list = null;
@@ -1185,10 +1186,11 @@
if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 鎼滅储妗嗘棤鍊兼垨鑰呮寜璁㈠崟鍙锋悳绱㈡椂閮藉彧鎼滅储涓昏鍗�
list = commonOrderMapper.listQueryWithNoChild(start, count, keyType, key, state, type, orderState,
startTime, endTime, source);
- } else
+ } else {
list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState, startTime, endTime,
- source);
-
+ source, listShopId, listGoodsId, minTime, money);
+ }
+
if (list == null) {
list = new ArrayList<CommonOrderVO>();
}
@@ -1372,12 +1374,15 @@
@Override
public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
- String startTime, String endTime, Integer source) throws CommonOrderException {
+ String startTime, String endTime, Integer source, List<Long> listShopId, List<Long> listGoodsId,
+ Date minTime, BigDecimal money) throws CommonOrderException {
if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 鎼滅储妗嗘棤鍊兼垨鑰呮寜璁㈠崟鍙锋悳绱㈡椂閮藉彧鎼滅储涓昏鍗�
return commonOrderMapper.countQueryWithNoChild(keyType, key, state, type, orderState, startTime, endTime,
source);
- } else
- return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime, source);
+ } else {
+ return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime, source, listShopId,
+ listGoodsId, minTime,money);
+ }
}
@Override
--
Gitblit v1.8.0