From 95654e5a5a1d0c4384cf44a1510c670ec804abc7 Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期二, 25 十二月 2018 14:42:06 +0800
Subject: [PATCH] 新版订单、红包
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 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 bbe08b8..836d0a2 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
@@ -2,6 +2,7 @@
import java.io.Serializable;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
@@ -48,10 +49,13 @@
// 鏌ヨ鏄惁鎻愪氦
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 {
+ return -6;
}
}
@@ -235,7 +239,7 @@
// 璁㈠崟鐢宠瘔浜哄伐閫氳繃鍚庯紝浣嗘槸闅斾簡3澶╄繕鏈鐞嗘垚鍔熷氨瑙嗕负璇ヨ鍗曠敵璇夊け璐�
lostOrderDao.update(
"update LostOrder lo set lo.resultCode=? where lo.state=1 and lo.resultCode=? and lo.handleTime<?",
- new Serializable[] { LostOrder.RESULT_CODE_FAIL, LostOrder.RESULT_CODE_VERFING,
+ new Serializable[] { LostOrder.RESULT_CODE_FAIL, LostOrder.RESULT_CODE_FAIL,
System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 3L });
}
@@ -251,4 +255,26 @@
lostOrderDao.update("delete from LostOrder lo where lo.userInfo.id=?", new Serializable[] { uid });
}
+ @Override
+ 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) {
+ 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