订单详情查询增加买一赠一寄件送券的返参

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

@@ -421,4 +421,58 @@ public class QueryOrderResponseVo {
         private String icon;
 
     }
+
+    /**
+     * 买一赠一用户选择的商品
+     */
+    private List<chooseGood> chooseGoods;
+
+    @Data
+    public static class chooseGood {
+
+        /**
+         * 活动code
+         */
+        private String activeCode;
+
+        /**
+         * 活动类型
+         */
+        private Integer activeType;
+
+        /**
+         * 赠送商品名称
+         */
+        private String goodsName;
+
+        /**
+         * 赠送商品id
+         */
+        private String goodsId;
+
+        /**
+         * 赠送商品数量
+         */
+        private Integer qty;
+
+        /**
+         * 可兑换商品券编号
+         */
+        private String couponCode ;
+
+        /**
+         * 可兑换券的数量
+         */
+        private Integer couponQty ;
+
+        /**
+         *  可兑换商品券名称
+         */
+        private String couponName ;
+
+        /**
+         *  是否已选择寄杯
+         */
+        private Boolean sendCoupon;
+    }
 }

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -89,6 +89,7 @@ import com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderC
 import com.freemud.application.sdk.api.ordercenter.response.carpark.OrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSendCouponResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
 import com.freemud.application.sdk.api.ordercenter.service.OrderDownLoadSdkService;
@@ -1293,6 +1294,8 @@ public class OrderServiceImpl implements Orderservice {
             joinPayGift(sessionId, queryOrderResponseVo);
         }
 
+        buildQueryOrderResponseVo(queryOrderResponseVo,response);
+
         return ResponseUtil.success(queryOrderResponseVo);
     }
 
@@ -3117,4 +3120,24 @@ public class OrderServiceImpl implements Orderservice {
         }
         return mealCodeRule;
     }
+
+    public void buildQueryOrderResponseVo(QueryOrderResponseVo queryOrderResponseVo,QueryOrderByIdResponse response) {
+
+        List<QueryOrderResponseVo.chooseGood> chooseGoods = new ArrayList<>();
+
+        List<OrderSendCouponResp> orderSendCouponRespList = response.getData().getOrderSendCouponRespList();
+
+        if(orderSendCouponRespList == null || orderSendCouponRespList.isEmpty()){
+            return;
+        }
+
+        orderSendCouponRespList.forEach(orderSendCouponResp -> {
+            QueryOrderResponseVo.chooseGood chooseGood = new QueryOrderResponseVo.chooseGood();
+            chooseGood.setGoodsName(orderSendCouponResp.getGoodsName());
+            chooseGoods.add(chooseGood);
+        });
+
+        queryOrderResponseVo.setChooseGoods(chooseGoods);
+
+    }
 }