From 69bee82b81626b82b7f39f0e459e4f56b1699b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:02:16 +0800
Subject: [PATCH] 正式数据库修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 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..0d2c9f1 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
@@ -14,9 +14,11 @@
import com.yeshi.fanli.dao.mybatis.order.LostOrderMapper;
import com.yeshi.fanli.dao.order.LostOrderDao;
-import com.yeshi.fanli.dao.order.PidOrderDao;
+import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.LostOrder;
import com.yeshi.fanli.entity.bus.user.Order;
+import com.yeshi.fanli.service.inter.order.CommonOrderService;
+import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.util.Constant;
@@ -29,10 +31,10 @@
private OrderService orderService;
@Resource
- private LostOrderDao lostOrderDao;
+ private HongBaoOrderService hongBaoOrderService;
@Resource
- private PidOrderDao pidOrderDao;
+ private LostOrderDao lostOrderDao;
@Resource
private LostOrderMapper lostOrderMapper;
@@ -49,10 +51,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;
}
}
@@ -62,7 +67,7 @@
}
// 鏌ヨ鏄惁涓哄垎浜禋璁㈠崟
- if (pidOrderDao.list("from PidOrder p where p.orderId=?", new Serializable[] { orderId }).size() > 0)
+ if (hongBaoOrderService.countByOrderNoAndHongBaoType(orderId, HongBaoV2.TYPE_SHARE_GOODS) > 0)
return -5;
WriteLock lostOrderwriteLock = lostOrderLock.writeLock();
@@ -256,21 +261,35 @@
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);
}
+
+ @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