足迹、收藏订单兼容新需求

yujian

2020-05-23 28cf328a098334b51a3e9d2d56f983fb8c862211

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

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

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

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

import com.yeshi.fanli.service.inter.order.msg.UserOrderMsgNotificationService;

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

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

import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService;

@@ -132,6 +133,9 @@


   @Resource

   private UserMoneyMsgNotificationService userMoneyMsgNotificationService;



   @Resource

   private UserOrderMsgNotificationService userOrderMsgNotificationService;



   @Resource

   private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;

@@ -216,7 +220,7 @@
            List<TaoBaoOrder> list = orders.get(orderId);

            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())) {

            if ("饿了么".equalsIgnoreCase(list.get(0).getOrderType())&&!pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT)) {

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

               if (TimeUtil.convertToTimeTemp(list.get(0).getCreateTime(),

                     "yyyy-MM-dd HH:mm:ss") >= Constant.NEW_ORDER_FANLI_RULE_TIME) {

@@ -1277,9 +1281,10 @@
            update.setUpdateTime(new Date());

            hongBaoV2Service.updateByPrimaryKeySelective(update);

         }

      // TODO 商家关店跑路需要赠送金币

      // userSystemCouponService.rewardCouponWin(uid,

      // UserSystemCoupon.SOURCE_SYSTEM_PUSH, 1, true, new BigDecimal("31"));



      if (hongBao.getType() == HongBaoV2.TYPE_ZIGOU || hongBao.getType() == HongBaoV2.TYPE_SHARE_GOODS) {

         userOrderMsgNotificationService.orderInvalidToBusinessRunning(uid, orderId, sourceType, hongBao.getType());

      }

   }



   @Transactional

@@ -1296,7 +1301,7 @@
            // 查询主红包

            HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());

            if (hongBaoOrder != null && hongBaoOrder.getHongBaoV2() != null) {

            if (hongBaoOrder.getHongBaoV2().getState() == HongBaoV2.STATE_BUKELINGQU) {

            if (hongBaoOrder.getHongBaoV2().getState() == HongBaoV2.STATE_BUKELINGQU || hongBaoOrder.getHongBaoV2().getState() == HongBaoV2.STATE_SHIXIAO) {

            // 订单失效,赠送金币

            try {

            invalidHongBaoV2AndGiveGodenCorn(hongBaoOrder.getHongBaoV2().getId(), hongBaoOrder.getHongBaoV2().getUserInfo().getId(), commonOrder.getOrderNo(), commonOrder.getSourceType(), "订单成功，商家未打款");