System 对象更名为 BusinessSystem

yujian

2019-03-14 4aadf484e193995c23ee1d5bb1971a497d2f9a0d

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

@@ -18,31 +18,23 @@
import com.alipay.api.request.AlipayFundTransToaccountTransferRequest;

import com.alipay.api.response.AlipayFundTransToaccountTransferResponse;

import com.google.gson.Gson;

import com.yeshi.fanli.dao.mybatis.AccountDetailsMapper;

import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;

import com.yeshi.fanli.dao.mybatis.AlipayAccountValidNormalHistoryMapper;

import com.yeshi.fanli.dao.mybatis.ExtractAuditRecordMapper;

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.AccountDetailsDao;

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.entity.bus.user.AccountDetails;

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;

@@ -54,12 +46,11 @@
import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

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.AccountDetailsService;

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;

@@ -67,7 +58,6 @@
import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.factory.AccountDetailsFactory;

import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;



import net.sf.json.JSONObject;

@@ -81,8 +71,6 @@
   @Resource

   private UserInfoService userInfoService;



   @Resource

   private MoneyRecordService moneyRecordService;



   @Resource

   private ConfigService configService;

@@ -93,8 +81,6 @@
   @Resource

   private SystemConfigService systemConfigService;



   @Resource

   private AccountDetailsService accountDetailsService;



   @Resource

   private AccountMessageService accountMessageService;

@@ -112,34 +98,16 @@
   private ExtractRecordDao extractRecordDao;



   @Resource

   private MoneyRecordDao moneyRecordDao;



   @Resource

   private AccountDetailsDao accountDetailsDao;



   @Resource

   private AccountMessageDao accountMessageDao;



   @Resource

   private PayInfoMapper payInfoMapper;



   @Resource

   private AccountDetailsMapper accountDetailsMapper;



   @Resource

   private MoneyRecordMapper moneyRecordMapper;



   @Resource

   private AccountMessageMapper accountMessageMapper;



   @Resource

   private ExtractRecordMapper extractRecordMapper;



   @Resource

   private SystemMapper systemMapper;



   @Resource

   private HongBaoMapper hongBaoMapper;



   @Resource

   private HongBaoV2Mapper hongBaoV2Mapper;

@@ -152,6 +120,9 @@


   @Resource

   private UserMoneyDetailMapper userMoneyDetailMapper;



   @Resource

   private UserMoneyMsgNotificationService userMoneyMsgNotificationService;



   @Resource

   private AlipayAccountValidNormalHistoryMapper alipayAccountValidNormalHistoryMapper;

@@ -197,9 +168,9 @@
   }



   @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 = extractDao.find(Extract.class, id);

      Extract find = extractMapper.selectByPrimaryKey(id);



      if (find == null) {

         throw new NotExistObjectException("不存在该对象");

@@ -212,9 +183,6 @@
      UserInfo user = find.getUserInfo();



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



      // 删除提现记录

      moneyRecordMapper.deleteMoneyRecordByExtractId(id);



      // 更新原来的状态

      Extract updateExtract = new Extract();

@@ -251,14 +219,9 @@


      // 更新提现记录审核表

      extractAuditRecordMapper.updateByPrimaryKeySelective(auditRecord);



      AccountDetails ad = AccountDetailsFactory.create("+" + find.getMoney(), AccountDetailsFactory.HUIKUAN, null,

            find, find.getUserInfo());

      accountDetailsMapper.insertSelective(ad);

      // 新版资金详情

      try {

         UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createExtractReject(find);

         userMoneyDetail.setId(ad.getId());

         userMoneyDetailMapper.insert(userMoneyDetail);

      } catch (UserMoneyDetailException e2) {

         try {

@@ -274,6 +237,9 @@
      } catch (Exception e) {

         e.printStackTrace();

      }



      // 新版通知

      userMoneyMsgNotificationService.extractFail(find, reason);

   }



   /**

@@ -308,19 +274,9 @@
      // 减去账户资金

      userInfoMapper.subHongBaoByUid(extract.getUserInfo().getId(), extract.getMoney());



      MoneyRecord moneyRecord = new MoneyRecord(user, null, extract.getMoney(), "提现", "", extract.getExtractTime(),

            2);

      moneyRecord.setExtract(extract);

      moneyRecordMapper.insertSelective(moneyRecord);



      AccountDetails ad = AccountDetailsFactory.create("-" + extract.getMoney(), AccountDetailsFactory.TIXIAN, null,

            extract, user);

      accountDetailsMapper.insertSelective(ad);



      // 新版资金详情

      try {

         UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createExtract(extract);

         userMoneyDetail.setId(ad.getId());

         userMoneyDetailMapper.insert(userMoneyDetail);

      } catch (UserMoneyDetailException e2) {

         try {

@@ -331,6 +287,8 @@
      }



      userNotificationService.extractApply(extract.getUserInfo().getId());

      // 添加新版通知

      userMoneyMsgNotificationService.extractApplay(extract);



      if ("是".equals(autoExtract)) {

         LogHelper.userInfo("uid=" + user.getId() + ",提交转账申请!");

@@ -478,14 +436,9 @@


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



         AccountDetails ad = AccountDetailsFactory.create("+" + extract.getMoney(), AccountDetailsFactory.HUIKUAN,

               null, extract, extract.getUserInfo());

         accountDetailsMapper.insertSelective(ad);



         // 新版资金详情

         try {

            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createExtractReject(extract);

            userMoneyDetail.setId(ad.getId());

            userMoneyDetailMapper.insert(userMoneyDetail);

         } catch (UserMoneyDetailException e2) {

            try {

@@ -507,6 +460,8 @@
            e.printStackTrace();

         }



         // 新版提现

         userMoneyMsgNotificationService.extractFail(extract, null);

      }

   }



@@ -530,6 +485,7 @@
      Extract updateExtract = new Extract();

      updateExtract.setId(extract.getId());

      updateExtract.setState(Constant.EXTRACT_PASS);

      updateExtract.setReceiveTime(new Date());

      updateExtract.setReason("提现成功");

      extractMapper.updateByPrimaryKeySelective(updateExtract);



@@ -542,7 +498,8 @@
      } catch (Exception e) {

         e.printStackTrace();

      }



      // 新版通知

      userMoneyMsgNotificationService.extractSuccess(extract);

   }



   /**