vip 消息

yujian

2020-04-02 0ec22dcf4fd9c4496e6f681e7fab89f56c6e4e8a

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

@@ -60,6 +60,7 @@
import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;

import com.yeshi.fanli.exception.user.UserAccountException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.log.OrderLogHelper;

import com.yeshi.fanli.service.inter.elme.ElmeHongBaoOrderMapService;

import com.yeshi.fanli.service.inter.elme.ElmeOrderProcessService;

import com.yeshi.fanli.service.inter.elme.ElmeOrderService;

@@ -72,6 +73,7 @@
import com.yeshi.fanli.service.inter.order.LostOrderService;

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

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

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

import com.yeshi.fanli.service.inter.order.jd.JDOrderService;

import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

@@ -79,7 +81,7 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

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

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.service.manger.HongBaoV2AddManager;

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

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

@@ -165,6 +167,9 @@
   @Resource

   private HongBaoV2AddManager hongBaoV2AddManager;



   @Resource

   private OrderTeamRewardService orderTeamRewardService;



   /**

    * 是否是分享订单

    * 

@@ -213,11 +218,14 @@
            String pid = String.format("mm_%s_%s_%s", configList.get(0).getAccountId(),

                  list.get(0).getSourceMediaId(), list.get(0).getAdPositionId());

            if ("饿了么".equalsIgnoreCase(list.get(0).getOrderType())) {

               // 处理饿了么订单

               elmeOrderMap.put(orderId, list);

            }



            else {

               // 饿了么订单开始归入到淘宝订单

               if (TimeUtil.convertToTimeTemp(list.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss") > TimeUtil

                     .convertToTimeTemp("2020-04-15", "yyyy-MM-dd")) {

                  fanliOrderMap.put(orderId, list);

               } else {

                  elmeOrderMap.put(orderId, list);

               }

            } else {

               if (!StringUtil.isNullOrEmpty(list.get(0).getSpecialId())

                     || pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID)) {// 设置渠道ID当做会员运营ID的位置ID

                  fanliOrderMap.put(orderId, list);

@@ -493,11 +501,12 @@
                           hongBaoOrder.getCommonOrder().getSourceType(), key);

                     return TransactionStatus.CommitTransaction;

                  } catch (Exception e) {

                     e.printStackTrace();

                     return TransactionStatus.RollbackTransaction;

                  }

               }

            }, null);

         else{

         else {

            try {

               orderMoneySettleService.ziGouSettle(hongBaoOrder.getCommonOrder().getOrderNo(),

                     hongBaoOrder.getCommonOrder().getSourceType(), key);

@@ -532,13 +541,8 @@
      if (orderList != null && orderList.size() > 0 & !StringUtil.isNullOrEmpty(orderList.get(0).getSettlementTime()))

         order.setJieSuanTime(

               new Date(TimeUtil.convertToTimeTemp(orderList.get(0).getSettlementTime(), "yyyy-MM-dd HH:mm:ss")));

      // if (order.getJieSuanTime().getTime() >=

      // TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {

      // return;

      // }



      // TODO 处理维权成功但是已到账的订单



      // 处理维权成功但是已到账的订单

      if (order.getJieSuanTime().getTime() > TimeUtil.convertToTimeTemp("2019-01-01", "yyyy-MM-dd")) {// 结算时间在2月1号的开始处理已到账但是维权的

         CommonOrder commonOrder = commonOrderService.selectBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO,

               order.getOrderItemId());

@@ -549,15 +553,34 @@
               TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService

                     .selectByOrderItemId(order.getOrderItemId());

               if (drawBack == null) {// 还未扣款

                  OrderLogHelper.taoBaoWeiQuan("已到账未扣款处理:子订单号:" + order.getOrderItemId());

                  try {

                     taoBaoWeiQuanDrawBackService.doWeiQuanFanli(order.getOrderId());

                     taoBaoWeiQuanDrawBackService.doWeiQuanFanli(order.getOrderId(), true);

                     taoBaoWeiQuanDrawBackService.doWeiQuanShare(order.getOrderId());

                     taoBaoWeiQuanDrawBackService.doWeiQuanInvite(order.getOrderId());

                  } catch (TaoBaoWeiQuanException e) {

                     try {

                        LogHelper.errorDetailInfo(e, null, "订单号:" + order.getOrderId());

                        LogHelper.errorDetailInfo(e, "到账后处理维权扣款出错", "订单号:" + order.getOrderId());

                     } catch (Exception e1) {

                        e1.printStackTrace();

                     }

                  }

               } else {

                  // 查询子红包是否已到账

                  List<HongBaoV2> children = hongBaoV2Service

                        .listChildrenById(hongBaoOrder.getHongBaoV2().getId());

                  for (HongBaoV2 hongBaoV2 : children) {

                     if (hongBaoV2.getState() == HongBaoV2.STATE_YILINGQU) {

                        try {

                           taoBaoWeiQuanDrawBackService.doWeiQuanInvite(order.getOrderId());

                        } catch (TaoBaoWeiQuanException e) {

                           try {

                              LogHelper.errorDetailInfo(e, "到账后处理维权扣款出错", "订单号:" + order.getOrderId());

                           } catch (Exception e1) {

                              e1.printStackTrace();

                           }

                        }

                        break;

                     }

                  }

               }

@@ -652,9 +675,16 @@
         if (oldOrder == null) {

            Long targetUid = null;

            if (pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID)

                  && !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {

                  && !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {// 处理非返利商品库的商品

               targetUid = taoBaoBuyRelationMapService.selectUidByRelationId(orderList.get(0).getRelationId());



            } else if (pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_ELEME_PID)

                  && !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {// 处理饿了么的订单

               UserExtraTaoBaoInfo extraInfo = userExtraTaoBaoInfoService

                     .getByRelationId(orderList.get(0).getRelationId());

               if (extraInfo != null) {

                  targetUid = extraInfo.getUser().getId();

               }

            } else if (!StringUtil.isNullOrEmpty(orderList.get(0).getSpecialId())) {

               UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService

                     .getBySpecialId(orderList.get(0).getSpecialId());

@@ -723,7 +753,8 @@
               order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);

               order.setUserInfo(new UserInfo(uid));

               try {

                  PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

                  if (!Constant.IS_TEST)

                     PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

               } catch (Exception e) {

               }

            }

@@ -1322,4 +1353,28 @@
      return false;

   }



   @Override

   public void fanliOrderTeamReward() {

      Date time = new Date();

      long count = orderTeamRewardService.countCanSettleUid(time);

      int pageSize = 500;

      int page = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

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

      for (int i = 0; i < page; i++) {

         List<Long> list = orderTeamRewardService.listCanSettleUid(time, i + 1, pageSize);

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

            uidList.addAll(list);

      }

      // 添加到队列

      if (uidList != null)

         for (Long uid : uidList)

            if (!Constant.IS_TEST)

               CMQManager.getInstance().addFanLiOrderTeamRewardMsg(uid);

   }



   @Override

   public void fanliOrderTeamReward(Long uid) throws OrderMoneySettleException {

      orderMoneySettleService.orderTeamRewardSettle(uid);

   }



}