Merge branch 'feature/20210628-配送回调记录商家承担配送费-wsc' into qa

# Conflicts:
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExpressReq.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/UpdateDeliveryInfoByIdRequest.java

@@ -4,6 +4,8 @@ import com.freemud.application.sdk.api.ordercenter.request.create.OrderTaskReq;
 import com.freemud.sdk.api.assortment.order.config.BaseConfig;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * All rights Reserved, Designed By www.freemud.cn
  *
@@ -93,4 +95,9 @@ public class UpdateDeliveryInfoByIdRequest extends BaseConfig {
      */
     public Long estimateArriveTime;
 
+    /**
+     * 商家承担的配送费(单位:分)
+     */
+    public BigDecimal businessDeliveryAmount;
+
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -1110,6 +1110,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         expressReq.setExceptionDesc(request.getExceptionDesc());
         expressReq.setExceptionId(request.getExceptionId());
         expressReq.setOpType(request.getOpType());
+        // 【ID1032317】外卖配送完成回调订单基础服务接口添加商户承担运费字段
+        expressReq.setBusinessDeliveryAmount(request.getBusinessDeliveryAmount());
         if(null !=request.getOrderClient() && OrderClientType.SAASMALL.getIndex() == request.getOrderClient() && 0 == request.getOpType()){
             OrderTaskReq orderTask = new OrderTaskReq();
             orderTask.setTaskType(5);

order-application-service/src/main/java/cn/freemud/entities/dto/delivery/CallbackUrlRequestDto.java

@@ -3,6 +3,8 @@ package cn.freemud.entities.dto.delivery;
 import cn.freemud.base.util.DateUtil;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * All rights Reserved, Designed By www.freemud.cn
  *
@@ -91,4 +93,9 @@ public class CallbackUrlRequestDto {
      */
     public Long estimateArriveTime;
 
+    /**
+     * 商家承担的配送费(单位:分)
+     */
+    public BigDecimal businessDeliveryAmount;
+
 }

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

@@ -137,6 +137,8 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         requestDto.setExceptionId(request.getExceptionId());
         //【ID1031049】 订单接受配送分配骑手状态回调
         requestDto.setEstimateArriveTime(request.getEstimateArriveTime());
+        // 【ID1032317】外卖配送完成回调订单基础服务接口添加商户承担运费字段
+        requestDto.setBusinessDeliveryAmount(request.getBusinessDeliveryAmount());
         if (StringUtils.isNotBlank(request.getRemark())) {
             requestDto.setRemark("配送:" + request.getRemark());
         }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExpressReq.java

@@ -15,6 +15,8 @@ package com.freemud.application.sdk.api.ordercenter.request;
 import com.freemud.application.sdk.api.ordercenter.request.create.OrderTaskReq;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class OrderExpressReq {
 
@@ -93,5 +95,10 @@ public class OrderExpressReq {
      */
     private String addressDetail;
 
+    /**
+     * 商家承担的配送费(单位:分)
+     */
+    public BigDecimal businessDeliveryAmount;
+
 
 }