Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop

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

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;
@@ -178,6 +179,11 @@ public class OrderServiceImpl implements Orderservice {
     @Value("${mq.cloud_print_exchange}")
     private String cloud_print_exchange;
 
+    /**
+     * coco商户
+     */
+    @Value("#{'${coco.partnerId}'.split(',')}")
+    private List<String> cocoPartnerId;
 
     @Autowired
     private AssortmentCloudPrinterManager cloudPrinterManager;
@@ -3533,4 +3539,24 @@ public class OrderServiceImpl implements Orderservice {
             return false;
         }
     }
+
+    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);
+
+    }
 }