Merge remote-tracking branch 'remotes/origin/feature-2020/4/16-1.9.20-满减配送费记录修改-海波'

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

@@ -300,6 +300,7 @@ public class OrderSdkAdapter {
                     orderCostCreateReq.setCostName(accountRequest.getName());
                     //新订单服务  1=包装费,2=运费,3=餐盒单价,4=餐盒数量
                     orderCostCreateReq.setCostType(getCostType(accountRequest.getAccountType()));
+                    orderCostCreateReq.setActualCostAmount(accountRequest.getActualPrice()!=null?accountRequest.getActualPrice():accountRequest.getPrice());
                     orderCostCreateReq.setCostAmount(accountRequest.getPrice());
                     originalAmount += accountRequest.getPrice();
                     orderCostCreateReq.setProductSeq(accountRequest.getSequence());

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

@@ -43,4 +43,9 @@ public class CreateOrderAccountRequest extends BaseConfig {
     private String productId;
 
     private Integer discountQty;
+
+    /**
+     * 真实费用 满减配送费 计算实际产生的配送费用
+     */
+    private Long actualPrice;
 }

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -180,6 +180,7 @@ public class OrderAdapter {
                     .price(deliveryAmount)
                     .accountType(getQueryOrderAccountType(OldOrderAccountType.getByCode(OrderAccountType.DELIVERY_AMOUNT.getCode())))
                     .sequence(orderAccountIndex++)
+                    .actualPrice(discountDeliveryAmount)
                     .build();
             orderAccountDtos.add(createOrderAccountDto);
         }
@@ -645,6 +646,7 @@ public class OrderAdapter {
                     .price(deliveryAmount)
                     .accountType(QueryOrderAccountType.DELIVERY_AMOUNT)
                     .sequence(orderAccountIndex++)
+                    .actualPrice(discountDeliveryAmount)
                     .build();
             orderAccountDtos.add(createOrderAccountDto);
         }

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

@@ -38,4 +38,7 @@ public class OrderCostCreateReq {
     //备注
     private String note;
 
+
+    private Long actualCostAmount;
+
 }