From bb133d1e82c337da646e90740b82584b82f9a0e6 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期六, 18 四月 2020 10:03:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java index e50225f..d786143 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java @@ -204,21 +204,21 @@ break; case HongBaoV2.TYPE_YIJI: userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType, - commonOrder.getPayment(), money, goodsCount, commonOrder.getState(), + commonOrder.getPayment(), money,new BigDecimal(0), goodsCount, commonOrder.getState(), commonOrder.getThirdCreateTime()); break; case HongBaoV2.TYPE_ERJI: - userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType, commonOrder.getPayment(), money, + userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType, commonOrder.getPayment(), money,new BigDecimal(0), goodsCount, commonOrder.getState(), commonOrder.getThirdCreateTime()); break; case HongBaoV2.TYPE_SHARE_YIJI: userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType, - commonOrder.getPayment(), money, goodsCount, commonOrder.getState(), + commonOrder.getPayment(), money,new BigDecimal(0), goodsCount, commonOrder.getState(), commonOrder.getThirdCreateTime()); case HongBaoV2.TYPE_SHARE_ERJI: - userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType, commonOrder.getPayment(), money, + userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType, commonOrder.getPayment(), money,new BigDecimal(0), goodsCount, commonOrder.getState(), commonOrder.getThirdCreateTime()); break; } -- Gitblit v1.8.0