Merge branch 'feature/xukang_20210315_麦咖啡p5v8'

order-application-service/src/main/java/cn/freemud/entities/dto/ecology/MccafeCompleteOrder.java

@@ -20,6 +20,11 @@ public class MccafeCompleteOrder {
     private String orderId;
 
     /**
+     * 展示订单编号
+     */
+    private String displayOrderId;
+
+    /**
      * 完成时间
      */
     private String utcTime;

order-application-service/src/main/java/cn/freemud/entities/dto/ecology/MccafeDeliveryOrder.java

@@ -20,6 +20,11 @@ public class MccafeDeliveryOrder {
     private String orderId;
 
     /**
+     * 展示订单编号
+     */
+    private String displayOrderId;
+
+    /**
      * 商品名称
      */
     private String productName;

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

@@ -443,6 +443,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
                 request.setMccafeDeliveryOrder(MccafeDeliveryOrder
                         .builder()
                         .orderId(orderBean.getOid())
+                        .displayOrderId(orderBean.getDownstreamThirdOrderCode())
                         .address(orderBean.getAddress().length()>20?orderBean.getAddress().substring(0,17)+"...":orderBean.getAddress())
                         .build());
             } else if(deliveryStatus == DeliveryStatus.DELIVERYARRIVED.getCode()) {
@@ -451,6 +452,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
                 request.setMccafeCompleteOrder(MccafeCompleteOrder
                         .builder()
                         .orderId(orderBean.getOid())
+                        .displayOrderId(orderBean.getDownstreamThirdOrderCode())
                         .orderAmount(new BigDecimal(orderBean.getActualPayAmount()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP).toString())
                         .utcTime(cn.freemud.base.util.DateUtil.convert2String(new Date(), "yyyy-MM-dd HH:mm:ss"))
                         .build());