创单增加买一赠一寄件信息传递到订单基础

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

 package com.freemud.sdk.api.assortment.order.adapter;
 
 import cn.freemud.base.constant.Version;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.couponcenter.offline.domain.ProductRedeemVO;
 import com.freemud.application.sdk.api.couponcenter.offline.domain.TransactionVO;
@@ -262,6 +263,12 @@ public class OrderSdkAdapter {
         //订单重量
         Double orderWeight = sumOrderWeight(requestVO.getProducts());
         request.setWeight(orderWeight);
+
+        // 买一赠一寄件信息
+        if(requestVO.getChooseGoods() != null || !requestVO.getChooseGoods().isEmpty()){
+            request.setChooseGoods(JSONArray.parseArray(JSONObject.toJSONString(requestVO.getChooseGoods()), CreateOrderRequest.ChooseGood.class));
+        }
+
         return request;
     }
 

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

@@ -222,4 +222,48 @@ public class BaseCreateOrderRequest extends BaseConfig {
 
     }
 
+    /**
+     * 买一赠一选择的商品
+     */
+    private List<ChooseGood> chooseGoods;
+
+    @Data
+    public static class ChooseGood {
+
+        /**
+         * 活动类型
+         */
+        private Integer activeType;
+
+        /**
+         * 活动号
+         */
+        private String activeCode;
+
+        /**
+         * 赠送商品id
+         */
+        private String goodsId;
+
+        /**
+         * 赠送商品数量
+         */
+        private Integer qty;
+
+        /**
+         * 可兑换商品券编号
+         */
+        private String couponCode ;
+
+        /**
+         * 商品券兑换数量
+         */
+        private Integer couponQty;
+
+        /**
+         *  是否已选择寄杯
+         */
+        private Boolean sendCoupon;
+    }
+
 }

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

@@ -314,6 +314,11 @@ public class OrderAdapter {
         createOrderDto.setPayChannelType(createOrderVo.getPayChannelType());
 
         // createOrderDto.setOtherInfo(getOrderOtherInfo(shoppingCartGoodsDto));
+
+        // 买一赠一寄件信息
+        if(createOrderVo.getChooseGoods() != null || !createOrderVo.getChooseGoods().isEmpty()){
+            createOrderDto.setChooseGoods(JSONArray.parseArray(JSONObject.toJSONString(createOrderVo.getChooseGoods()), BaseCreateOrderRequest.ChooseGood.class));
+        }
         return createOrderDto;
     }
 

order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java

@@ -182,7 +182,7 @@ public class CreateOrderVo {
     /**
      * 买一赠一选择的商品
      */
-    private List<chooseGood> chooseGoods;
+    private List<ChooseGood> chooseGoods;
 
     /**
      * 是否使用用户积分
@@ -354,7 +354,7 @@ public class CreateOrderVo {
     }
 
     @Data
-    public static class chooseGood {
+    public static class ChooseGood {
 
         /**
          * 活动类型

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

@@ -215,4 +215,48 @@ public class CreateOrderRequest extends BaseRequest {
 
     private Byte payChannelType;
 
+    /**
+     * 买一赠一选择的商品
+     */
+    private List<ChooseGood> chooseGoods;
+
+    @Data
+    public static class ChooseGood {
+
+        /**
+         * 活动类型
+         */
+        private Integer activeType;
+
+        /**
+         * 活动号
+         */
+        private String activeCode;
+
+        /**
+         * 赠送商品id
+         */
+        private String goodsId;
+
+        /**
+         * 赠送商品数量
+         */
+        private Integer qty;
+
+        /**
+         * 可兑换商品券编号
+         */
+        private String couponCode ;
+
+        /**
+         * 商品券兑换数量
+         */
+        private Integer couponQty;
+
+        /**
+         *  是否已选择寄杯
+         */
+        private Boolean sendCoupon;
+    }
+
 }