Merge remote-tracking branch 'origin/div' into div

yujian

2020-04-14 c04a59775ee986f33fe19e21ae02cff9f6b002a7

 fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java

@@ -53,6 +53,7 @@
import com.yeshi.fanli.entity.common.AdminUser;

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

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

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.exception.ExtractException;

import com.yeshi.fanli.exception.NotExistObjectException;

import com.yeshi.fanli.exception.ObjectStateException;

@@ -67,6 +68,7 @@
import com.yeshi.fanli.service.inter.money.extract.ExtractService;

import com.yeshi.fanli.service.inter.money.extract.ExtractWeiXinRecordService;

import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;

import com.yeshi.fanli.service.inter.order.CommonOrderCountService;

import com.yeshi.fanli.service.inter.order.HongBaoV2Service;

import com.yeshi.fanli.service.inter.order.OrderUserStatisticService;

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

@@ -77,6 +79,7 @@
import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.TimeUtil;

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



@@ -150,6 +153,9 @@


   @Resource

   private ExtractWeiXinRecordService extractWeiXinRecordService;



   @Resource

   private CommonOrderCountService commonOrderCountService;



   @Transactional

   public Integer addExtract(Extract extract) {

@@ -268,9 +274,9 @@
            && (System.currentTimeMillis() - history.getCreateTime().getTime()) < 1000 * 60 * 60 * 24 * 7L)

         return 111;



      final String autoExtract = configService.get("extract_way"); // 是否自动转账

      final String maxCount = configService.get("extract_count_day");

      final String maxMoney = configService.get("extract_money_day");

      final String autoExtract = configService.get(ConfigKeyEnum.extractWay.getKey()); // 是否自动转账

      final String maxCount = configService.get(ConfigKeyEnum.extractDayCount.getKey());

      final String maxMoney = configService.get(ConfigKeyEnum.extractMoneyDay.getKey());



      UserInfo user = userInfoMapper.selectByPrimaryKeyForUpdate(extract.getUserInfo().getId());

      // 余额不足

@@ -291,20 +297,32 @@


      extractMapper.insertSelective(extract);



      ExtractAuditRecord auditRecord = new ExtractAuditRecord();

      final ExtractAuditRecord auditRecord = new ExtractAuditRecord();

      auditRecord.setBeforeMoney(user.getMyHongBao());

      auditRecord.setExtract(extract);



      Date minTime = new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 180L);

      // 统计数据

      int orderCount50More = orderUserStatisticService.countOrderCount100MoreByUidAndMinTime(user.getId(), minTime);



      BigDecimal weiQuanOrderFanAmount = orderUserStatisticService.sumWeiQuanOrderFanAmountByUid(user.getId(),

            minTime);

      int weiQuanOrderCount = orderUserStatisticService.countWeiQuanOrderByUid(user.getId(), minTime);

      auditRecord.setExtraInfoStr(new Gson()

            .toJson(new ExtractOrderStatisticDTO(orderCount50More, weiQuanOrderCount, weiQuanOrderFanAmount, 0)));

      extractAuditRecordMapper.insertSelective(auditRecord);



      ThreadUtil.run(new Runnable() {



         @Override

         public void run() {

            // 统计数据

            int less10Count = commonOrderCountService.countOderByUidAndLess10(user.getId());

            ExtractAuditRecord update = new ExtractAuditRecord();

            update.setId(auditRecord.getId());

            int orderCount50More = orderUserStatisticService.countOrderCount100MoreByUidAndMinTime(user.getId(),

                  minTime);

            BigDecimal weiQuanOrderFanAmount = orderUserStatisticService.sumWeiQuanOrderFanAmountByUid(user.getId(),

                  minTime);

            int weiQuanOrderCount = orderUserStatisticService.countWeiQuanOrderByUid(user.getId(), minTime);

            update.setExtraInfoStr(new Gson().toJson(new ExtractOrderStatisticDTO(orderCount50More,

                  weiQuanOrderCount, weiQuanOrderFanAmount, 0, less10Count)));

            extractAuditRecordMapper.updateByPrimaryKeySelective(update);

         }

      });



      // 新版资金详情

      UserMoneyDetail userMoneyDetail = null;

@@ -529,8 +547,13 @@
      } catch (Exception e) {

         e.printStackTrace();

      }

      List<PayInfo> payInfoList = payInfoMapper.getListbyExtractId(extract.getId());

      String alipayNo = "";

      if (payInfoList != null && payInfoList.size() > 0)

         alipayNo = payInfoList.get(0).getOrderId();



      // 新版通知

      userMoneyMsgNotificationService.extractSuccess(extract);

      userMoneyMsgNotificationService.extractSuccess(extract, alipayNo);

   }



   /**

@@ -883,10 +906,6 @@
         LogHelper.errorDetailInfo(e);

      }



      // 4、发送消息通知

      String desc = "为保障你的账户余额安全，自动提现金额将不会高于5元";

      String beizu = "账户中剩余余额请在本App内完成提现";

      userMoneyMsgNotificationService.extractAuto(extractRecord, "未领取-提现中", desc, beizu);

   }



   private boolean parseSendResult(String result) {

@@ -1225,11 +1244,6 @@
         // 资金计算

         userMoneyService.subUserMoney(userInfo.getId(), money, detail);



         // 4、发送消息通知

         String desc = "为保障你的账户余额安全，自动提现金额将不会高于5元";

         String beizu = "账户中剩余余额请在本App内完成提现";

         userMoneyMsgNotificationService.extractAuto(extractRecord, "未领取-提现中", desc, beizu);



         // 满足条件返回信息

         return userInfo;

      }

@@ -1315,8 +1329,6 @@
      extractWeiXinRecordService.updateByPrimaryKeySelective(updeteRecord);



      if (ExtractWeiXinRecord.RECEIVED.equals(status)) {

         // 发送消息通知

         userMoneyMsgNotificationService.extractAuto(record, "已领取-已提现", null, null);

      } else if (ExtractWeiXinRecord.REFUND.equals(status)) {

         // 资金明细

         UserMoneyDetail detail = new UserMoneyDetail();

@@ -1328,12 +1340,8 @@
         detail.setType(UserMoneyDetailTypeEnum.extractAutoWXRefund);

         detail.setUpdateTime(new Date());

         detail.setUserInfo(new UserInfo(record.getUid()));



         // 资金计算

         userMoneyService.addUserMoney(record.getUid(), record.getMoney(), detail);



         // 发送消息通知

         userMoneyMsgNotificationService.extractAuto(record, "已退回-余额中", null, null);

      }

   }