From f8243b5e55762c3d87b1ba2d39f610c11adec189 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期三, 29 四月 2020 17:52:23 +0800 Subject: [PATCH] 订单找回消息bug --- fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java index 532a496..f9aefe4 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java +++ b/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())); } } } -- Gitblit v1.8.0