From 723f7f30bd818548cb3dc2a75d11e9666cca4f8a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 03 一月 2019 15:05:11 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
index 9c6d9f2..576f0d4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
@@ -54,8 +54,7 @@
} else if (orderList.get(0).getState() == 1
&& orderList.get(0).getResultCode() == LostOrder.RESULT_CODE_SUCCESS) {
return -1;
- } else if (orderList.get(0).getState() == 1
- && orderList.get(0).getResultCode() == LostOrder.RESULT_CODE_FAIL) {
+ } else {
return -6;
}
}
--
Gitblit v1.8.0