From 3b46a3cf795784fd9e4ca8f168da4c75ad871ba7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 15 一月 2019 09:21:12 +0800
Subject: [PATCH] 足迹返回修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 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 bbe08b8..85396a7 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
@@ -1,7 +1,12 @@
package com.yeshi.fanli.service.impl.order;
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
@@ -9,6 +14,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.yeshi.utils.DateUtil;
import org.yeshi.utils.NumberUtil;
import com.yeshi.fanli.dao.mybatis.order.LostOrderMapper;
@@ -48,10 +54,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;
}
}
@@ -251,4 +260,42 @@
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);
+ }
+
+
+ @Override
+ public List<Map<String, Object>> countLostNum( Integer dateType, Integer resultCode,
+ String year, String startTime, String endTime) throws Exception {
+ return lostOrderMapper.countLostNum(dateType, resultCode, year, startTime, endTime);
+ }
+
+
+ @Override
+ public List<Map<String, Object>> countAppealMoney( Integer dateType, String year, String startTime,
+ String endTime) throws Exception {
+
+ return lostOrderMapper.countAppealMoney(dateType, year, startTime, endTime);
+ }
+
}
--
Gitblit v1.8.0