2.1需求

yujian

2020-05-09 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64

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

@@ -246,16 +246,17 @@
            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)

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

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

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

               }

            }



            // TODO 分享订单可找回

				
            if (order != null)

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

                     Constant.TYPE_REBATE, order.getMoney(), order.getMoney(), goodsCount,

                     new Date(lo.getCreateTime()));

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

         }

      }

   }

@@ -270,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());

         }

   }



@@ -288,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());

         }

   }