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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java

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


import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

import java.util.HashMap;

import java.util.HashSet;

@@ -54,7 +53,6 @@
import com.yeshi.fanli.service.inter.order.OrderMoneySettleService;

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

import com.yeshi.fanli.service.manger.order.TeamRewardManager;

import com.yeshi.fanli.service.manger.order.TeamSubsidyManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.cmq.HongBaoRecieveCMQManager;

@@ -109,8 +107,6 @@
   @Resource

   private TeamRewardManager teamRewardManager;



   @Resource

   private TeamSubsidyManager teamSubsidyManager;



   // 下级被封禁，红包失效

   private void invalidHongBaoForbidden(Long id) {

@@ -322,8 +318,7 @@


   @Transactional(rollbackFor = Exception.class)

   @Override

   public void shareSettleTB(Long uid) throws OrderMoneySettleException {

      Date maxPregetTime = new Date();

   public void shareSettleTB(Long uid, Date maxPregetTime) throws OrderMoneySettleException {

      /**

       * 处理分享赚

       */

@@ -369,8 +364,7 @@


   @Transactional(rollbackFor = Exception.class)

   @Override

   public void shareSettleJD(Long uid) throws OrderMoneySettleException {

      Date maxPregetTime = new Date();

   public void shareSettleJD(Long uid, Date maxPregetTime) throws OrderMoneySettleException {

      /**

       * 处理分享赚

       */

@@ -411,8 +405,7 @@


   @Transactional(rollbackFor = Exception.class)

   @Override

   public void shareSettlePDD(Long uid) throws OrderMoneySettleException {

      Date maxPregetTime = new Date();

   public void shareSettlePDD(Long uid, Date maxPregetTime) throws OrderMoneySettleException {

      /**

       * 处理分享赚

       */

@@ -669,7 +662,6 @@
      List<Long> hbIdList = new ArrayList<>();

      Set<String> drawBackOrders = new HashSet<String>();

      List<Long> recieveHongBaoIds = new ArrayList<>();

      int shareGoodsCount = 0;

      Set<String> shareOrders = new HashSet<>();



      for (HongBaoV2 hongBao : hongBaoList) {

@@ -693,7 +685,6 @@
            HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(hongBao.getId());

            if (hongBaoOrder != null) {

               balanceTime = hongBaoOrder.getCommonOrder().getSettleTime();

               shareGoodsCount += hongBaoOrder.getCommonOrder().getCount();

            }

            shareOrders.add(hongBaoOrder.getCommonOrder().getOrderNo());

            if (balanceTime != null

@@ -710,22 +701,8 @@
      if (sharemoney.compareTo(new BigDecimal(0)) > 0) {

         // 添加新版详情记录

         try {

            // 计算本月的有效订单，失效订单，维权订单

            Calendar ca = Calendar.getInstance();



            Date maxDate = new Date(TimeUtil

                  .convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));

            ca.add(Calendar.MONTH, -1);



            Date minDate = new Date(TimeUtil

                  .convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));

            long validCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_JS,

                  minDate, maxDate, Constant.SOURCE_TYPE_TAOBAO);

            long weiQuanCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_WQ,

                  minDate, maxDate, Constant.SOURCE_TYPE_TAOBAO);



            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, Constant.SOURCE_TYPE_TAOBAO,

                  (int) validCount, (int) weiQuanCount, sharemoney, new Date());

                  sharemoney, new Date());

            // 添加资金

            userMoneyService.addUserMoney(uid, sharemoney, userMoneyDetail);



@@ -742,9 +719,8 @@
         }



         // 新版通知

         userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(),

               shareGoodsCount, sharemoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao(), null,

               null);

         userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, sharemoney,

               userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao(), new Date());



         for (String orderId : drawBackOrders)

            taoBaoWeiQuanDrawBackService.doWeiQuanShare(orderId);

@@ -755,7 +731,8 @@
      // 所有的返利到账红包ID

      for (Long hongBaoId : recieveHongBaoIds) {

         try {

            HongBaoRecieveCMQManager.getInstance().addHongBaoRecieveMsg(hongBaoId);

            if (Constant.ENABLE_MQ)

               HongBaoRecieveCMQManager.getInstance().addHongBaoRecieveMsg(hongBaoId);

         } catch (Exception e) {

            LogHelper.errorDetailInfo(e);

         }

@@ -774,7 +751,6 @@
      BigDecimal sharemoney = new BigDecimal(0);

      List<Long> hbIdList = new ArrayList<>();

      List<Long> recieveHongBaoIds = new ArrayList<>();

      int shareGoodsCount = 0;

      Set<String> shareOrders = new HashSet<>();



      for (HongBaoV2 hongBao : hongBaoList) {

@@ -795,9 +771,6 @@
            hbIdList.add(hongBao.getId());

            // 2018-08-05 过后的订单才处理维权

            HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(hongBao.getId());

            if (hongBaoOrder != null) {

               shareGoodsCount += hongBaoOrder.getCommonOrder().getCount();

            }

            shareOrders.add(hongBaoOrder.getCommonOrder().getOrderNo());

         }

      }

@@ -809,22 +782,8 @@
      if (sharemoney.compareTo(new BigDecimal(0)) > 0) {

         // 添加新版详情记录

         try {

            // 计算本月的有效订单，失效订单，维权订单

            Calendar ca = Calendar.getInstance();



            Date maxDate = new Date(TimeUtil

                  .convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));

            ca.add(Calendar.MONTH, -1);



            Date minDate = new Date(TimeUtil

                  .convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));

            long validCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_JS,

                  minDate, maxDate, sourceType);

            long weiQuanCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_WQ,

                  minDate, maxDate, sourceType);



            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, sourceType, (int) validCount,

                  (int) weiQuanCount, sharemoney, new Date());

            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, sourceType, sharemoney,

                  new Date());

            // 添加资金

            userMoneyService.addUserMoney(uid, sharemoney, userMoneyDetail);



@@ -840,10 +799,8 @@
            }

         }



         // 新版通知

         userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(),

               shareGoodsCount, sharemoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao(), null,

               null);

         userMoneyMsgNotificationService.shareOrderReceived(uid, sourceType, sharemoney,

               userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao(), new Date());

      }



      hongBaoV2SettleTempService.addTemp(recieveHongBaoIds, key);

@@ -851,27 +808,14 @@
      // 所有的返利到账红包ID

      for (Long hongBaoId : recieveHongBaoIds) {

         try {

            HongBaoRecieveCMQManager.getInstance().addHongBaoRecieveMsg(hongBaoId);

            if (Constant.ENABLE_MQ)

               HongBaoRecieveCMQManager.getInstance().addHongBaoRecieveMsg(hongBaoId);

         } catch (Exception e) {

            LogHelper.errorDetailInfo(e);

         }

      }

   }



   /**

    * 邀请补贴结算

    * 
    * @param orderId

    * @param sourceType

    * @throws ParamsException 
    * @throws TeamEincomeRecordException 
    */

   @Transactional(rollbackFor = Exception.class)

   @Override

   public void inviteSubsidySettle(Long uid, String taskKey,Date maxPreGetTime)

         throws OrderMoneySettleException, TeamEincomeRecordException, ParamsException {

      teamSubsidyManager.addToTeamEincome(uid, taskKey,maxPreGetTime);

   }



   private String getTaskKey(Long uid) {

      return uid + "-" + UUID.randomUUID().toString();