【数据上报】如果是套餐商品，只上报套餐，不上报明细， 解决数据上报商品数量(20)超限制报错

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -264,7 +264,11 @@ public class OrderCallBackMQService {
         wechatReportOrderDto.setStatus(NewOrderStatus.PENDING_PAYMENT.getIndex().equals(orderInfoReqs.getOrderState()) ? 2 : 1);
         // 菜品列表
         List<WechatReportOrderDto.DishInfo> dishList = new ArrayList<>();
+        //【ID1040698】【数据上报】如果是套餐商品，只上报套餐，不上报明细， 解决数据上报商品数量(20)超限制报错
         for (OrderItemResp item : orderInfoReqs.getOrderItemList()) {
+            if(StringUtils.isNotEmpty(item.getParentProductId()) && !"0".equals(item.getParentProductId())){
+                continue;
+            }
             WechatReportOrderDto.DishInfo dishInfo = new WechatReportOrderDto.DishInfo();
             dishInfo.setOutDishNo(item.getProductId());
             dishInfo.setCount(item.getProductQuantity());
@@ -273,6 +277,9 @@ public class OrderCallBackMQService {
             dishInfo.setUrl(item.getProductPicUrl());
             dishList.add(dishInfo);
         }
+        if(dishList.size() >20){
+            dishList.subList(0,20);
+        }
         wechatReportOrderDto.setDishList(dishList);
         return wechatReportOrderDto;
     }