Merge branch 'featur/20210602-订单新增订单优惠金额-zy' into qa

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

@@ -234,6 +234,10 @@ public class OrderSdkAdapter {
         List<OrderCostCreateReq> orderCostCreateReqs = new ArrayList<>();
         // 更新订单商品详情信息
         originalAmount = updateOrderItemsAndSettlements(orderItemList, orderSettlementCreateReqList, orderCostCreateReqs, requestVO.getProducts(), requestVO.getAccounts(), requestVO.getCompanyId());
+        //增加总优惠记录
+        if (!CollectionUtils.isEmpty(requestVO.getAccounts())) {
+            addTotalDisaccountData(orderSettlementCreateReqList, requestVO);
+        }
         //商品信息赋值
         request.setOrderItemList(orderItemList);
         //订单原始金额，单位分
@@ -287,6 +291,24 @@ public class OrderSdkAdapter {
         return request;
     }
 
+    private void addTotalDisaccountData(List<OrderSettlementCreateReq> orderSettlementCreateReqList, BaseCreateOrderRequest requestVO) {
+        OrderSettlementCreateReq createReq = new OrderSettlementCreateReq();
+        createReq.setProductId("0");
+        createReq.setProductSeq(0);
+        createReq.setNumber(0);
+        createReq.setExternalObjectId("");
+        createReq.setSettlementType(205);
+        //商家优惠
+        createReq.setShopDiscountAmount(requestVO.getTotalDiscountAmount());
+        //结算金额
+        createReq.setSettlementAmount(requestVO.getAmount());
+        createReq.setPlatformDiscountAmount(0L);
+        //是否线上 false:不是 true:是
+        createReq.setIsOnline(true);
+        createReq.setExternalObjectName("优惠总金额");
+        orderSettlementCreateReqList.add(createReq);
+    }
+
     public com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest convent2NEWCreateMCCafeOrderRequest(BaseCreateOrderRequest requestVO) {
         com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest request = new com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest();
         request.setPartnerId(requestVO.getCompanyId());

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

@@ -179,6 +179,8 @@ public class    BaseCreateOrderRequest extends BaseConfig {
      */
     private Byte marketingType;
 
+    private Long totalDiscountAmount;
+
     @Data
     public static class DeliveryTypeInfo {
         /**

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

@@ -340,6 +340,7 @@ public class OrderAdapter {
         }
         createOrderDto.setAccounts(CollectionUtils.isNotEmpty(orderAccountDtos) ? orderAccountDtos : Collections.emptyList());
 
+        createOrderDto.setTotalDiscountAmount(shoppingCartGoodsDto.getTotalDiscountAmount());
         // update by miaohui 20201030 for 【ID1018638】【C端服务端】活动库存接口调整对接
         ActivityUpdateStockRequest activityUpdateStockRequest = this.initActivityUpdateStockRequest(activityDiscountsDtos);