From 1e53e5f28c55ece70b28c752fa318e2fd951e643 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 20 三月 2019 16:33:51 +0800
Subject: [PATCH] taobao 下dao改造以及删除dao

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java |   67 +--------------------------------
 1 files changed, 3 insertions(+), 64 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
index 17ca4f6..7d75d63 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
@@ -1,6 +1,5 @@
 package com.yeshi.fanli.service.impl.user;
 
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -24,22 +23,14 @@
 import com.yeshi.fanli.dao.mybatis.ExtractMapper;
 import com.yeshi.fanli.dao.mybatis.ExtractRecordMapper;
 import com.yeshi.fanli.dao.mybatis.HongBaoV2Mapper;
-import com.yeshi.fanli.dao.mybatis.MoneyRecordMapper;
 import com.yeshi.fanli.dao.mybatis.PayInfoMapper;
-import com.yeshi.fanli.dao.mybatis.SystemMapper;
 import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
-import com.yeshi.fanli.dao.mybatis.hongbao.HongBaoMapper;
 import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;
-import com.yeshi.fanli.dao.user.AccountMessageDao;
-import com.yeshi.fanli.dao.user.ExtractDao;
-import com.yeshi.fanli.dao.user.ExtractRecordDao;
-import com.yeshi.fanli.dao.user.MoneyRecordDao;
+import com.yeshi.fanli.dto.HongBao;
 import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
 import com.yeshi.fanli.entity.bus.user.Extract;
 import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;
 import com.yeshi.fanli.entity.bus.user.ExtractRecord;
-import com.yeshi.fanli.entity.bus.user.HongBao;
-import com.yeshi.fanli.entity.bus.user.MoneyRecord;
 import com.yeshi.fanli.entity.bus.user.PayInfo;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.entity.common.AdminUser;
@@ -53,10 +44,8 @@
 import com.yeshi.fanli.service.inter.config.SystemConfigService;
 import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;
 import com.yeshi.fanli.service.inter.push.PushService;
-import com.yeshi.fanli.service.inter.user.AccountMessageService;
 import com.yeshi.fanli.service.inter.user.ExtractRecordService;
 import com.yeshi.fanli.service.inter.user.ExtractService;
-import com.yeshi.fanli.service.inter.user.MoneyRecordService;
 import com.yeshi.fanli.service.inter.user.UserInfoService;
 import com.yeshi.fanli.service.inter.user.UserNotificationService;
 import com.yeshi.fanli.util.CMQManager;
@@ -72,13 +61,7 @@
 public class ExtractServiceImpl implements ExtractService {
 
 	@Resource
-	private ExtractDao extractDao;
-
-	@Resource
 	private UserInfoService userInfoService;
-
-	@Resource
-	private MoneyRecordService moneyRecordService;
 
 	@Resource
 	private ConfigService configService;
@@ -88,10 +71,6 @@
 
 	@Resource
 	private SystemConfigService systemConfigService;
-
-
-	@Resource
-	private AccountMessageService accountMessageService;
 
 	@Resource
 	private ExtractMapper extractMapper;
@@ -103,31 +82,13 @@
 	private UserInfoMapper userInfoMapper;
 
 	@Resource
-	private ExtractRecordDao extractRecordDao;
-
-	@Resource
-	private MoneyRecordDao moneyRecordDao;
-
-	@Resource
-	private AccountMessageDao accountMessageDao;
-
-	@Resource
 	private PayInfoMapper payInfoMapper;
-
-	@Resource
-	private MoneyRecordMapper moneyRecordMapper;
 
 	@Resource
 	private AccountMessageMapper accountMessageMapper;
 
 	@Resource
 	private ExtractRecordMapper extractRecordMapper;
-
-	@Resource
-	private SystemMapper systemMapper;
-
-	@Resource
-	private HongBaoMapper hongBaoMapper;
 
 	@Resource
 	private HongBaoV2Mapper hongBaoV2Mapper;
@@ -147,24 +108,10 @@
 	@Resource
 	private AlipayAccountValidNormalHistoryMapper alipayAccountValidNormalHistoryMapper;
 
-	public List<Extract> getExtractInfoByUid(long uid) {
-		return extractDao.list("from Extract e where e.userInfo.id=? and e.state != 2", new Serializable[] { uid });
-	}
-
 	@Transactional
 	public Integer addExtract(Extract extract) {
 		Integer integer = extract(extract);
 		return integer;
-	}
-
-	public List<Extract> getExtractList(int index) {
-		int start = index * Constant.PAGE_SIZE;
-		return extractDao.list("from Extract e order by e.id desc", start, Constant.PAGE_SIZE, new Serializable[] {});
-	}
-
-	public int getCount() {
-		Long lcount = extractDao.getCount("select count(e.id) from Extract e");
-		return lcount.intValue();
 	}
 
 	@Transactional
@@ -188,7 +135,7 @@
 	}
 
 	@Transactional
-	public synchronized void rejectExtract(long id, String reason, long extractTime, AdminUser admin)
+	public synchronized void rejectExtract(long id, String reason, AdminUser admin)
 			throws ObjectStateException, NotExistObjectException {
 		Extract find = extractMapper.selectByPrimaryKey(id);
 
@@ -203,9 +150,6 @@
 		UserInfo user = find.getUserInfo();
 
 		userInfoMapper.addHongBaoByUid(user.getId(), find.getMoney());
-
-		// 鍒犻櫎鎻愮幇璁板綍
-		moneyRecordMapper.deleteMoneyRecordByExtractId(id);
 
 		// 鏇存柊鍘熸潵鐨勭姸鎬�
 		Extract updateExtract = new Extract();
@@ -296,11 +240,6 @@
 
 		// 鍑忓幓璐︽埛璧勯噾
 		userInfoMapper.subHongBaoByUid(extract.getUserInfo().getId(), extract.getMoney());
-
-		MoneyRecord moneyRecord = new MoneyRecord(user, null, extract.getMoney(), "鎻愮幇", "", extract.getExtractTime(),
-				2);
-		moneyRecord.setExtract(extract);
-		moneyRecordMapper.insertSelective(moneyRecord);
 
 		// 鏂扮増璧勯噾璇︽儏
 		try {
@@ -535,7 +474,7 @@
 	 */
 	@Override
 	public Extract getExtractById(long id) {
-		return extractDao.find(Extract.class, id);
+		return extractMapper.selectByPrimaryKey(id);
 	}
 
 	@Override

--
Gitblit v1.8.0