Merge remote-tracking branch 'origin/master'

admin

2019-01-19 0e5e21d2f3693dc993b3f49d88a275f7b226eba5

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

@@ -24,11 +24,13 @@
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;

@@ -44,13 +46,14 @@
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.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;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.push.PushService;

import com.yeshi.fanli.service.inter.user.AccountDetailsService;

import com.yeshi.fanli.service.inter.user.AccountMessageService;

@@ -65,6 +68,7 @@
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;



@@ -138,10 +142,16 @@
   private HongBaoMapper hongBaoMapper;



   @Resource

   private HongBaoV2Mapper hongBaoV2Mapper;



   @Resource

   private PushService pushService;



   @Resource

   private UserNotificationService userNotificationService;



   @Resource

   private UserMoneyDetailMapper userMoneyDetailMapper;



   @Resource

   private AlipayAccountValidNormalHistoryMapper alipayAccountValidNormalHistoryMapper;

@@ -245,6 +255,19 @@
      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 {

            LogHelper.errorDetailInfo(e2);

         } catch (Exception e3) {

            e3.printStackTrace();

         }

      }



      try {

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

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

@@ -293,6 +316,19 @@
      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());



@@ -446,6 +482,19 @@
               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 {



            userNotificationService.extractTransferFail(user.getId(),

@@ -506,8 +555,8 @@


   @Override

   public void checkExtract(String uid) throws ExtractException {

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

      if (count == 0)

      Long count = hongBaoV2Mapper.countByUidAndState(Long.parseLong(uid), HongBao.STATE_YILINGQU);

      if (count == null || count == 0)

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

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

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