From a358495d588a844d9fb2e3e4a9b6c043274aac68 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 29 四月 2020 17:55:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
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