Skip to content

O
order-group
Commit 78c555a0 by 徐康
Options

Merge branch 'feature/xukang_20210907_麦咖啡订单数据推送到麦当劳' into qa

parents 15a96d0c 2c5f4ba4
Showing with 1 additions and 1 deletions
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
...@@ -2928,7 +2928,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2928,7 +2928,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
orderFoe.setPickupCode(orderInfoReqs.getPickUpGoodsNo()); orderFoe.setPickupCode(orderInfoReqs.getPickUpGoodsNo());
orderFoe.setStatus("20"); orderFoe.setStatus("20");
orderFoe.setFoeType("1"); orderFoe.setFoeType("1");
orderFoe.setCreatedDate(DateUtil.convert2String(new Date(Long.valueOf(orderInfoReqs.getAcceptTime())), "yyyy-MM-dd HH:mm:ss")); orderFoe.setCreatedDate(DateUtil.convert2String(new Date(Long.valueOf(orderInfoReqs.getCreateTime())), "yyyy-MM-dd HH:mm:ss"));
orderFoeList.add(orderFoe); orderFoeList.add(orderFoe);
if(NewOrderStatus.CLOSED.getIndex().equals(orderInfoReqs.getOrderState()) && CollectionUtils.isNotEmpty(orderInfoReqs.getAfterSalesOrderList())) { if(NewOrderStatus.CLOSED.getIndex().equals(orderInfoReqs.getOrderState()) && CollectionUtils.isNotEmpty(orderInfoReqs.getAfterSalesOrderList())) {
McCafePushOrderDto.OrderFoe afterSaleOrderFoe = new McCafePushOrderDto.OrderFoe(); McCafePushOrderDto.OrderFoe afterSaleOrderFoe = new McCafePushOrderDto.OrderFoe();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment