System 对象更名为 BusinessSystem

yujian

2019-03-14 4aadf484e193995c23ee1d5bb1971a497d2f9a0d

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java

@@ -24,22 +24,17 @@
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 +51,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 +71,6 @@
   @Resource

   private UserInfoService userInfoService;



   @Resource

   private MoneyRecordService moneyRecordService;



   @Resource

   private ConfigService configService;

@@ -106,28 +98,16 @@
   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;

@@ -188,7 +168,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 +183,6 @@
      UserInfo user = find.getUserInfo();



      userInfoMapper.addHongBaoByUid(user.getId(), find.getMoney());



      // 删除提现记录

      moneyRecordMapper.deleteMoneyRecordByExtractId(id);



      // 更新原来的状态

      Extract updateExtract = new Extract();

@@ -296,11 +273,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 {