From 379e7b99ff3ca1e02d3847de0581ba1f89312113 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 三月 2020 16:13:00 +0800
Subject: [PATCH] 订单确认收货消息新增下单时间
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index 4ddf476..0cda0a4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -1071,15 +1071,21 @@
if (!Constant.IS_TEST) {
// 缁熻缁撶畻閲戦
BigDecimal settlement = new BigDecimal("0");
+ CommonOrder firstOrder = null;
for (CommonOrderAddResultDTO dto : resultList)
- if (dto.getCommonOrder().getSettlement() != null)
+ if (dto.getCommonOrder().getSettlement() != null) {
settlement = settlement.add(dto.getCommonOrder().getSettlement());
- CommonOrder firstOrder=resultList.get(0).getCommonOrder();
- OrderConfirmMQMsg mqMsg = new OrderConfirmMQMsg(firstOrder.getOrderNo(),
- firstOrder.getSourceType(), settlement, firstOrder.getUserInfo().getId(),
- new Date());
- Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.orderConfirm, mqMsg);
- orderProducer.send(msg);
+ if (firstOrder == null)
+ firstOrder = dto.getCommonOrder();
+ }
+ if (firstOrder != null) {
+ Date placeDate = firstOrder.getThirdCreateTime();
+ OrderConfirmMQMsg mqMsg = new OrderConfirmMQMsg(firstOrder.getOrderNo(), firstOrder.getSourceType(),
+ settlement, firstOrder.getUserInfo().getId(), placeDate, new Date());
+ Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.orderConfirm,
+ mqMsg);
+ orderProducer.send(msg);
+ }
}
}
--
Gitblit v1.8.0