From 0849ec5d0ba9934035e78f490357366ca7e84224 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 26 七月 2019 17:41:06 +0800
Subject: [PATCH] 维权订单相关修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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 3bb5112..d8e6169 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
@@ -775,8 +775,14 @@
commonOrder.setCommonOrderGoods(goods);
}
- CommonOrder oldCommonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(commonOrder.getOrderNo(),
- commonOrder.getSourceType(), commonOrder.getOrderBy());
+ CommonOrder oldCommonOrder = null;
+
+ if (!StringUtil.isNullOrEmpty(commonOrder.getTradeId()))
+ oldCommonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(commonOrder.getSourceType(),
+ commonOrder.getTradeId());
+ else
+ oldCommonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(commonOrder.getOrderNo(),
+ commonOrder.getSourceType(), commonOrder.getOrderBy());
if (oldCommonOrder == null)// 鏂板
{
@@ -787,9 +793,9 @@
commonOrder.getTradeId(), new Date(), commonOrder.getSourceType()));
return commonOrder;
} else {// 淇敼
- // 宸茬粡缁撶畻鎴栬�呭凡缁忓け鏁堢殑璁㈠崟涓嶅鐞�
- if (oldCommonOrder.getState() == CommonOrder.STATE_JS
- || oldCommonOrder.getState() == CommonOrder.STATE_SX) {
+ // 宸茬粡缁撶畻锛屽凡缁忓け鏁堬紝鐘舵�佹湭鏀瑰彉鐨勮鍗曚笉澶勭悊
+ if (oldCommonOrder.getState() == CommonOrder.STATE_JS || oldCommonOrder.getState() == CommonOrder.STATE_SX
+ || (oldCommonOrder.getState().intValue() == commonOrder.getState())) {
return oldCommonOrder;
}
// 浜ゆ槗ID涓�鑷存墠淇敼
@@ -1204,4 +1210,11 @@
return commonOrderMapper.listBySourceTypeAndTradeId(sourceType, tradeId);
}
+ @Override
+ public List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(int sourceType, Integer state, Long minTime,
+ Long maxTime, int page, int pageSize) {
+ return commonOrderMapper.listBySourceTypeAndStateAndThirdCrateTime(sourceType, state, minTime, maxTime,
+ (page - 1) * pageSize, pageSize);
+ }
+
}
--
Gitblit v1.8.0