From cdcbed9af813b2a02cdc01eefa24db8bec6b51a9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 三月 2019 12:17:33 +0800
Subject: [PATCH] 主分类 + 子分类 DAO改造

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java |   79 ++++++---------------------------------
 1 files changed, 13 insertions(+), 66 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 4ca5863..27f1dae 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,6 +1,6 @@
 package com.yeshi.fanli.service.impl.order;
 
-import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
@@ -10,10 +10,8 @@
 
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.yeshi.utils.NumberUtil;
 
 import com.yeshi.fanli.dao.mybatis.order.LostOrderMapper;
-import com.yeshi.fanli.dao.order.LostOrderDao;
 import com.yeshi.fanli.entity.bus.user.HongBaoV2;
 import com.yeshi.fanli.entity.bus.user.LostOrder;
 import com.yeshi.fanli.entity.bus.user.Order;
@@ -31,9 +29,6 @@
 
 	@Resource
 	private HongBaoOrderService hongBaoOrderService;
-
-	@Resource
-	private LostOrderDao lostOrderDao;
 
 	@Resource
 	private LostOrderMapper lostOrderMapper;
@@ -75,9 +70,10 @@
 		try {
 			try {
 				lostOrderwriteLock.lock();
-				List<LostOrder> list = lostOrderDao.list(
-						"from LostOrder lo where lo.orderId= ? and lo.type = ? and (lo.state = 0 or lo.state = 1)", 0,
-						1, new Serializable[] { orderId, type });
+				List<Integer> stateList = new ArrayList<>();
+				stateList.add(0);
+				stateList.add(1);
+				List<LostOrder> list = lostOrderMapper.listByOrderIdAndTypeAndState(orderId, type, stateList);
 				if (list.size() > 0) {
 					LostOrder find = list.get(0);
 					Integer state = find.getState();
@@ -106,7 +102,8 @@
 			} else {
 				lostOrder.setJudge("涓嶅尮閰�");
 			}
-			lostOrderDao.save(lostOrder);
+
+			lostOrderMapper.insertSelective(lostOrder);
 		} finally {
 			lostOrderReadLock.unlock();
 		}
@@ -152,49 +149,6 @@
 	}
 
 	@Override
-	public List<LostOrder> findLostOrderList(String key, int page) {
-		List<LostOrder> list;
-		if (key == null || "".equals(key.trim())) {
-			list = lostOrderDao.list("from LostOrder lo order by id desc", (page - 1) * Constant.PAGE_SIZE,
-					Constant.PAGE_SIZE, new Serializable[] {});
-		} else {
-			if (NumberUtil.isNumeric(key) && key.length() >= 18) {
-				// long id = Long.parseLong(key);
-				list = lostOrderDao.list("from LostOrder lo where lo.orderId like ? order by id desc",
-						(page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, new Serializable[] { "%" + key + "%" });
-
-			} else {
-
-				list = lostOrderDao.list("from LostOrder lo where lo.userInfo.nickName like ? order by id desc",
-						(page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, new Serializable[] { "%" + key + "%" });
-			}
-
-		}
-		return list;
-	}
-
-	@Override
-	public int getCount(String key) {
-		int count = 0;
-		if (key == null || "".equals(key.trim())) {
-			count = (int) lostOrderDao.getCount("select count(*) from LostOrder");
-		} else {
-
-			if (NumberUtil.isNumeric(key) && key.length() >= 18) {
-				// long id = Long.parseLong(key);
-				count = (int) lostOrderDao.getCount("select count(*) from LostOrder lo where lo.orderId like ?",
-						new Serializable[] { "%" + key + "%" });
-			} else {
-
-				count = (int) lostOrderDao.getCount(
-						"select count(*) from LostOrder lo where lo.userInfo.nickName like ?",
-						new Serializable[] { "%" + key + "%" });
-			}
-		}
-		return count;
-	}
-
-	@Override
 	public LostOrder getOne(long id) {
 		return lostOrderMapper.selectByPrimaryKey(id);
 	}
@@ -202,14 +156,12 @@
 	@Override
 	public List<LostOrder> getLostOrderListByUid(Long uid, int page, int pageSize) {
 
-		return lostOrderDao.list("from LostOrder lo where lo.userInfo.id=? order by lo.createTime desc",
-				(page - 1) * pageSize, pageSize, new Serializable[] { uid });
+		return lostOrderMapper.listByUidOrderByCreateTimeDesc(uid, (page - 1) * pageSize, pageSize);
 	}
 
 	@Override
 	public long getLostOrderCountByUid(Long uid) {
-		return lostOrderDao.getCount("select count(*)  from LostOrder lo where lo.userInfo.id=?",
-				new Serializable[] { uid });
+		return lostOrderMapper.countAllByUid(uid);
 	}
 
 	@Transactional
@@ -245,23 +197,18 @@
 	@Override
 	public void processFail() {
 		// 璁㈠崟鐢宠瘔浜哄伐閫氳繃鍚庯紝浣嗘槸闅斾簡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,
-						System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 3L });
+		lostOrderMapper.processFail();
 	}
 
 	@Override
 	public void deleteLostOrder(long id) {
-
-		LostOrder lostOrder = new LostOrder();
-		lostOrder.setId(id);
-		lostOrderDao.delete(lostOrder);
+		lostOrderMapper.deleteByPrimaryKey(id);
 	}
 
 	@Override
 	public void deleteLostOrderByUid(long uid) {
-		lostOrderDao.update("delete from LostOrder lo where lo.userInfo.id=?", new Serializable[] { uid });
+
+		lostOrderMapper.deleteByUid(uid);
 	}
 
 	@Override

--
Gitblit v1.8.0