From e3732fa01883aa7a93f7398e39b01b0009155b06 Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期四, 14 三月 2019 09:46:36 +0800 Subject: [PATCH] 等级代码调整 --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java | 28 ++-------------------------- 1 files changed, 2 insertions(+), 26 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..c73444f 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 @@ -24,22 +24,18 @@ 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; @@ -56,7 +52,6 @@ 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; @@ -77,8 +72,6 @@ @Resource private UserInfoService userInfoService; - @Resource - private MoneyRecordService moneyRecordService; @Resource private ConfigService configService; @@ -106,16 +99,10 @@ private ExtractRecordDao extractRecordDao; @Resource - private MoneyRecordDao moneyRecordDao; - - @Resource private AccountMessageDao accountMessageDao; @Resource private PayInfoMapper payInfoMapper; - - @Resource - private MoneyRecordMapper moneyRecordMapper; @Resource private AccountMessageMapper accountMessageMapper; @@ -125,9 +112,6 @@ @Resource private SystemMapper systemMapper; - - @Resource - private HongBaoMapper hongBaoMapper; @Resource private HongBaoV2Mapper hongBaoV2Mapper; @@ -188,7 +172,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 +187,6 @@ UserInfo user = find.getUserInfo(); userInfoMapper.addHongBaoByUid(user.getId(), find.getMoney()); - - // 鍒犻櫎鎻愮幇璁板綍 - moneyRecordMapper.deleteMoneyRecordByExtractId(id); // 鏇存柊鍘熸潵鐨勭姸鎬� Extract updateExtract = new Extract(); @@ -296,11 +277,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 { -- Gitblit v1.8.0