From a6f01cf9667958ca3d5c2f2ef28637baa8bf5e6d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 25 七月 2019 12:20:01 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 33e4af3..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
@@ -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