2.1需求

yujian

2020-05-09 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64

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

@@ -17,6 +17,8 @@
import com.yeshi.fanli.entity.bus.user.HongBaoV2;

import com.yeshi.fanli.entity.bus.user.LostOrder;

import com.yeshi.fanli.entity.bus.user.Order;

import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.entity.order.HongBaoOrder;

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

import com.yeshi.fanli.service.inter.config.ConfigService;

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

@@ -24,6 +26,7 @@
import com.yeshi.fanli.service.inter.order.OrderService;

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.Utils;



@Service

@@ -239,10 +242,21 @@
            update.setResultCode(LostOrder.RESULT_CODE_SUCCESS);

            lostOrderMapper.updateByPrimaryKeySelective(update);

            Order order = orderService.findOrderByOrderIdAndType(orderId, orderType);



            List<HongBaoOrder> hongBaoOrderList = hongBaoOrderService.listDetailByOrderIdAndSourceType(orderId,

                  orderType);

            int goodsCount = 0;

            BigDecimal fanMoney = new BigDecimal(0);

            for (HongBaoOrder hongBaoOrder : hongBaoOrderList) {

               if (hongBaoOrder.getCommonOrder().getState() != CommonOrder.STATE_SX) {

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

                  fanMoney = fanMoney.add(hongBaoOrder.getHongBaoV2().getMoney());

               }

            }

				
            if (order != null)

               // 添加通知

               userOrderMsgNotificationService.orderFoundSuccess(lo.getUserInfo().getId(), lo.getOrderId(),

                     order.getMoney(), orderType, new Date(lo.getHandleTime()));

               userOrderMsgNotificationService.orderFoundSuccess(lo.getUserInfo().getId(), orderId, orderType,

                     Constant.TYPE_REBATE, order.getMoney(), fanMoney, goodsCount, new Date(lo.getCreateTime()));

         }

      }

   }

@@ -257,8 +271,7 @@
            update.setResultCode(LostOrder.RESULT_CODE_FAIL);

            lostOrderMapper.updateByPrimaryKeySelective(update);

            // 添加通知

            userOrderMsgNotificationService.orderFoundFail(order.getUserInfo().getId(), order.getOrderId(), null, 1,

                  new Date(order.getHandleTime()));

            userOrderMsgNotificationService.orderFoundFail(order.getUserInfo().getId(), order.getOrderId());

         }

   }



@@ -275,8 +288,7 @@
            update.setResultCode(LostOrder.RESULT_CODE_FAIL);

            lostOrderMapper.updateByPrimaryKeySelective(update);

            // 添加通知

            userOrderMsgNotificationService.orderFoundFail(order.getUserInfo().getId(), order.getOrderId(), null, 1,

                  new Date(order.getHandleTime()));

            userOrderMsgNotificationService.orderFoundFail(order.getUserInfo().getId(), order.getOrderId());

         }

   }



@@ -316,8 +328,8 @@
   }



   @Override

   public Integer countLostOrderNum(String preDay) {

      return lostOrderMapper.countLostOrderNum(preDay);

   public Integer countLostOrderNum(String preDay, int resultCode) {

      return lostOrderMapper.countLostOrderNum(preDay, resultCode);

   }



   @Override