From ffd6563902758e7509d1acde4ad2fdf0bfd235fe Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 20 十一月 2018 18:20:43 +0800
Subject: [PATCH] Merge branch 'master' of ssh://yujian@193.112.35.168:29418/fanli-server.git
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 97d4e21..9c6d9f2 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
@@ -49,10 +49,14 @@
// 鏌ヨ鏄惁鎻愪氦
List<LostOrder> orderList = lostOrderMapper.selectByOrderId(orderId);
if (orderList != null && orderList.size() > 0) {
- if (orderList.get(0).getState() == 0) {
+ if (orderList.get(0).getState() == 0 || orderList.get(0).getResultCode() == LostOrder.RESULT_CODE_VERFING) {
return -2;
- } else {
+ } 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) {
+ return -6;
}
}
@@ -256,19 +260,20 @@
public Map<String, Object> countByUid(long uid) {
return lostOrderMapper.countByUid(uid);
}
-
+
/**
* 鍚庣鍒楄〃鏌ヨ
+ *
* @param start
* @param count
* @param key
* @return
*/
@Override
- public List<LostOrder> listQuery(long start, int count, String key, Integer state, Integer handleType) {
+ public List<LostOrder> listQuery(long start, int count, String key, Integer state, Integer handleType) {
return lostOrderMapper.listQuery(start, count, key, state, handleType);
}
-
+
@Override
public long countQuery(String key, Integer state, Integer handleType) {
return lostOrderMapper.countQuery(key, state, handleType);
--
Gitblit v1.8.0