From a8e45a802600ca1cde28fe8522a26635328bbd99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 三月 2019 17:45:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java |   70 +++++++++++++++++++++++++++++-----
 1 files changed, 59 insertions(+), 11 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..4ca5863 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;
 
@@ -13,9 +14,10 @@
 
 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.HongBaoOrderService;
 import com.yeshi.fanli.service.inter.order.LostOrderService;
 import com.yeshi.fanli.service.inter.order.OrderService;
 import com.yeshi.fanli.util.Constant;
@@ -28,14 +30,15 @@
 	private OrderService orderService;
 
 	@Resource
-	private LostOrderDao lostOrderDao;
+	private HongBaoOrderService hongBaoOrderService;
 
 	@Resource
-	private PidOrderDao pidOrderDao;
+	private LostOrderDao lostOrderDao;
 
 	@Resource
 	private LostOrderMapper lostOrderMapper;
 
+	@Transactional
 	@Override
 	public int addLostOrder(LostOrder lostOrder) {
 		String orderId = lostOrder.getOrderId();
@@ -48,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;
 			}
 		}
 
@@ -61,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();
@@ -136,13 +142,13 @@
 		}
 		lostOrder.setHandleTime(System.currentTimeMillis());
 		lostOrder.setResultCode(LostOrder.RESULT_CODE_VERFING);
-		lostOrderDao.update(lostOrder);
+		lostOrderMapper.updateByPrimaryKeySelective(lostOrder);
 	}
 
 	public void reject(LostOrder lostOrder) {
 		lostOrder.setHandleTime(System.currentTimeMillis());
 		lostOrder.setState(2);
-		lostOrderDao.update(lostOrder);
+		lostOrderMapper.updateByPrimaryKeySelective(lostOrder);
 	}
 
 	@Override
@@ -190,7 +196,7 @@
 
 	@Override
 	public LostOrder getOne(long id) {
-		return lostOrderDao.find(LostOrder.class, id);
+		return lostOrderMapper.selectByPrimaryKey(id);
 	}
 
 	@Override
@@ -226,8 +232,14 @@
 
 	@Override
 	public void processFail(String orderId) {
-		lostOrderDao.update("update LostOrder lo set lo.resultCode=? where lo.orderId=?",
-				new Serializable[] { LostOrder.RESULT_CODE_FAIL, orderId });
+		List<LostOrder> list = lostOrderMapper.selectByOrderId(orderId);
+		if (list != null)
+			for (LostOrder order : list) {
+				LostOrder update = new LostOrder();
+				update.setId(order.getId());
+				update.setResultCode(LostOrder.RESULT_CODE_FAIL);
+				lostOrderMapper.updateByPrimaryKeySelective(update);
+			}
 	}
 
 	@Override
@@ -241,6 +253,7 @@
 
 	@Override
 	public void deleteLostOrder(long id) {
+
 		LostOrder lostOrder = new LostOrder();
 		lostOrder.setId(id);
 		lostOrderDao.delete(lostOrder);
@@ -251,4 +264,39 @@
 		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