Merge remote-tracking branch…

Merge remote-tracking branch 'remotes/origin/feature_20200426_1.9.21_refundDeliveryFee' into develop

# Conflicts:
#	assortment-ordercenter-sdk/readme.md
#	ordercenter-sdk/readme.md

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -654,6 +654,7 @@ public class OrderSdkAdapter {
             accountBean.setName(orderCostResp.getCostName());
             accountBean.setNumber(1);
             accountBean.setPrice(orderCostResp.getCostAmount().longValue());
+            accountBean.setActualCostAmount(null != orderCostResp.getActualCostAmount() ? orderCostResp.getActualCostAmount().longValue() : 0);
             accountBean.setSequence(orderCostResp.getProductSeq());
             //新订单服务  1=包装费，2=运费，5=会员卡费用
             if (orderCostResp.getCostType() == 2) {

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -567,6 +567,11 @@ public class QueryOrdersResponse {
                  * 优惠金额
                  */
                 private Long price;
+
+                // 实际金额
+                private Long actualCostAmount;
+
+
                 private Integer sequence;
                 /**
                  * 结算对象类型  1 运费 2折扣 3包装费 4积分 5 优惠券 6线下支付 7 微信 8 支付宝 9 商户金额

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderCostResp.java

@@ -39,6 +39,9 @@ public class OrderCostResp {
     //费用金额
     private BigDecimal costAmount;
 
+    //实际金额
+    private BigDecimal actualCostAmount;
+
     //备注
     private String note;