From 09476adf2ae2bcc2f6685dafe4707938fd82bc78 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 25 七月 2019 12:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 9a694f1..15d76b2 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
@@ -855,9 +855,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涓�鑷存墠淇敼
@@ -1155,10 +1155,14 @@
@Override
- public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState)
+ public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState, Integer sourceType)
throws CommonOrderException {
- CommonOrderVO commonOrderVO = commonOrderMapper.getCommonOrderByOrderNo(uid, orderNo, orderState);
+ if (sourceType == null) {
+ sourceType = Constant.SOURCE_TYPE_TAOBAO;
+ }
+
+ CommonOrderVO commonOrderVO = commonOrderMapper.getCommonOrderByOrderNo(uid, orderNo, orderState, sourceType);
// 璁㈠崟淇℃伅涓虹┖
if (commonOrderVO == null) {
return null;
@@ -1183,13 +1187,13 @@
}
String orderNo1 = commonOrder.getOrderNo();
- Integer sourceType = commonOrder.getSourceType();
+ Integer sourceType1 = commonOrder.getSourceType();
String orderNo2 = commonOrderVO.getOrderNo();
Integer sourceType2 = commonOrderVO.getSourceType();
// 鏉ユ簮銆佽鍗曞彿鐩稿悓
- if (sourceType.equals(sourceType2) && orderNo1.equals(orderNo2)) {
+ if (sourceType1.equals(sourceType2) && orderNo1.equals(orderNo2)) {
// 鍔犲叆鍟嗗搧淇℃伅
List<CommonOrderGoodsVO> listOrderGoods = commonOrderVO.getListOrderGoods();
--
Gitblit v1.8.0