替换原来老的资金详情

admin

2018-12-25 4cb15e222cd7d099d533ccbeb7f9a8cd99bf180c

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

@@ -2,7 +2,6 @@


import java.io.Serializable;

import java.math.BigDecimal;

import java.util.Calendar;

import java.util.Date;

import java.util.List;

import java.util.Map;

@@ -30,25 +29,27 @@
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.entity.bus.user.AlipayAccountValidNormalHistory;

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;

import com.yeshi.fanli.exception.AlipayAccountException;

import com.yeshi.fanli.exception.AlipayTransferException;

import com.yeshi.fanli.entity.money.UserMoneyDetail;

import com.yeshi.fanli.exception.ExtractException;

import com.yeshi.fanli.exception.NotExistObjectException;

import com.yeshi.fanli.exception.ObjectStateException;

import com.yeshi.fanli.exception.money.UserMoneyDetailException;

import com.yeshi.fanli.log.LogHelper;

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

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

@@ -60,14 +61,13 @@
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.BeanUtil;

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

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;



@@ -138,13 +138,16 @@
   private SystemMapper systemMapper;



   @Resource

   private HongBaoMapper hongBaoService;

   private HongBaoMapper hongBaoMapper;



   @Resource

   private PushService pushService;



   @Resource

   private UserNotificationService userNotificationService;

	
   @Resource

   private UserMoneyDetailMapper userMoneyDetailMapper;



   @Resource

   private AlipayAccountValidNormalHistoryMapper alipayAccountValidNormalHistoryMapper;

@@ -248,8 +251,21 @@
      AccountDetails ad = AccountDetailsFactory.create("+" + find.getMoney(), AccountDetailsFactory.HUIKUAN, null,

            find, find.getUserInfo());

      accountDetailsMapper.insertSelective(ad);

      // 新版资金详情

      try {

         userNotificationService.extractWrong(user.getId(),

         UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createExtractReject(find);

         userMoneyDetail.setId(ad.getId());

         userMoneyDetailMapper.insert(userMoneyDetail);

      } catch (UserMoneyDetailException e2) {

         try {

            LogHelper.errorDetailInfo(e2);

         } catch (Exception e3) {

            e3.printStackTrace();

         }

      }



      try {

         userNotificationService.extractWrong(user.getId(), find,

               TimeUtil.getGernalTime(find.getExtractTime(), "yyyy-MM-dd HH:mm"));

      } catch (Exception e) {

         e.printStackTrace();

@@ -296,6 +312,20 @@
      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 {

            LogHelper.errorDetailInfo(e2);

         } catch (Exception e1) {

            e1.printStackTrace();

         }

      }

		


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



@@ -448,6 +478,21 @@
         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 {

               LogHelper.errorDetailInfo(e2);

            } catch (Exception e1) {

               e1.printStackTrace();

            }

         }

			
			


         try {



@@ -488,7 +533,7 @@
      extractMapper.updateByPrimaryKeySelective(updateExtract);



      try {

         userNotificationService.extractSuccess(extract.getUserInfo().getId(),

         userNotificationService.extractSuccess(extract.getUserInfo().getId(), extract,

               TimeUtil.getGernalTime(extract.getExtractTime(), "yyyy-MM-dd HH:mm"));



         LogHelper.userInfo("支付宝转账成功:[提现IP：" + extract.getIp() + ",所转账号:" + extract.getAccount() + ",真实姓名："

@@ -508,8 +553,13 @@
   }



   @Override

   public List<Integer> checkExtract(String uid) {

      return extractMapper.checkExtract(uid);

   public void checkExtract(String uid) throws ExtractException {

      int count = hongBaoMapper.getCountByUidAndState(Long.parseLong(uid), HongBao.STATE_YILINGQU);

      if (count == 0)

         throw new ExtractException(1, "没有已到账的红包");

      List<Integer> list = extractMapper.checkExtract(uid);

      if (list != null && list.size() > 0 && list.get(0) == 0)

         throw new ExtractException(2, "结算资金异常");

   }



   @Override

@@ -671,4 +721,8 @@


   }



   @Override

   public double countTodayMoney(Long uid) {

      return extractMapper.countTodayMoney(uid);

   }

}