华莱士商户号

套餐商品子商品skuid

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

@@ -204,6 +204,8 @@ public class OrderServiceImpl implements Orderservice {
      */
     @Value("#{'${coco.partnerId}'.split(',')}")
     private List<String> cocoPartnerId;
+    @Value("#{'${hls.partnerId}'.split(',')}")
+    private List<String> hlsPartnerId;
 
     @Value("${query.order.es:true}")
     private Boolean queryOrderEs;
@@ -1417,7 +1419,15 @@ public class OrderServiceImpl implements Orderservice {
             payGitRequestDto.setPayType(1);//1-微信,2-储值卡
         }
         if (CollectionUtils.isNotEmpty(queryOrderResponseVo.getProducts())) {
-            payGitRequestDto.setSkuIds(queryOrderResponseVo.getProducts().stream().map(p -> p.getPid()).collect(Collectors.toList()));
+            // add by miaohui for 20210325_华莱士紧急上线需求支付有礼须支持套餐内固定可选商品_miaohui start
+            List<String> skuIds = queryOrderResponseVo.getProducts().stream().map(p -> p.getPid()).collect(Collectors.toList());
+            if (hlsPartnerId != null && hlsPartnerId.contains(partnerId)) {
+                // 华莱士获取支付有理促销数据时须将套餐商品内固定搭配、可选搭配商品的skuId一同传入
+                List subProductSkuIds = new ArrayList<>();
+                skuIds.addAll(subProductSkuIds);
+            }
+            payGitRequestDto.setSkuIds(skuIds);
+            // add by miaohui for 20210325_华莱士紧急上线需求支付有礼须支持套餐内固定可选商品_miaohui end
         }
         if (OrderType.COLLECT_GOODS.getCode().intValue() == queryOrderResponseVo.getOrderType() || OrderType.EAT_IN.getCode().intValue() == queryOrderResponseVo.getOrderType()) {
             payGitRequestDto.setOrderWay(1);