From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 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 0469f1d..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()));
}
}
}
@@ -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());
}
}
--
Gitblit v1.8.0