admin
2019-03-15 c9f28b430799cc8d40c7a7d99fd0f0eeecff6a5c
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
@@ -24,21 +24,16 @@
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.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.MoneyRecord;
import com.yeshi.fanli.entity.bus.user.PayInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.common.AdminUser;
@@ -52,10 +47,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;
@@ -77,9 +70,6 @@
   private UserInfoService userInfoService;
   @Resource
   private MoneyRecordService moneyRecordService;
   @Resource
   private ConfigService configService;
   @Resource
@@ -87,10 +77,6 @@
   @Resource
   private SystemConfigService systemConfigService;
   @Resource
   private AccountMessageService accountMessageService;
   @Resource
   private ExtractMapper extractMapper;
@@ -105,25 +91,13 @@
   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 HongBaoV2Mapper hongBaoV2Mapper;
@@ -184,7 +158,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);
@@ -199,9 +173,6 @@
      UserInfo user = find.getUserInfo();
      userInfoMapper.addHongBaoByUid(user.getId(), find.getMoney());
      // 删除提现记录
      moneyRecordMapper.deleteMoneyRecordByExtractId(id);
      // 更新原来的状态
      Extract updateExtract = new Extract();
@@ -292,11 +263,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 {