admin
2019-03-13 69bee82b81626b82b7f39f0e459e4f56b1699b51
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
@@ -18,7 +18,6 @@
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;
@@ -31,12 +30,10 @@
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.entity.bus.user.AlipayTransferResultInfo;
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;
@@ -56,7 +53,6 @@
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;
@@ -68,7 +64,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;
@@ -94,8 +89,6 @@
   @Resource
   private SystemConfigService systemConfigService;
   @Resource
   private AccountDetailsService accountDetailsService;
   @Resource
   private AccountMessageService accountMessageService;
@@ -116,16 +109,10 @@
   private MoneyRecordDao moneyRecordDao;
   @Resource
   private AccountDetailsDao accountDetailsDao;
   @Resource
   private AccountMessageDao accountMessageDao;
   @Resource
   private PayInfoMapper payInfoMapper;
   @Resource
   private AccountDetailsMapper accountDetailsMapper;
   @Resource
   private MoneyRecordMapper moneyRecordMapper;
@@ -255,14 +242,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 {
@@ -320,14 +302,9 @@
      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 {
@@ -487,14 +464,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 {