麦咖啡套餐不能合并商品

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

@@ -209,7 +209,8 @@ public class DeliveryAdapter {
                         deliveryComboProductInfo.setTaxId(StringUtils.isNotEmpty(orderComboProductAddInfoDto.getTaxId()) ? orderComboProductAddInfoDto.getTaxId() : "10");
                         deliveryComboProductInfo.setTaxRate(orderComboProductAddInfoDto.getTax() > 0 ? orderComboProductAddInfoDto.getTax() : 6);
 
-                        deliveryComboProductInfo.setParentCode(Long.valueOf(comboProduct.getParentProductId().split("_")[0]));
+                        deliveryComboProductInfo.setParentCode(Long.valueOf(comboProduct.getParentProductId().replace("_", "")));
+                        deliveryProductInfo.setProductCode(deliveryComboProductInfo.getParentCode()+"");
 
                         productInfos.add(deliveryComboProductInfo);
                     });