Merge remote-tracking branch 'origin/qa' into qa

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

@@ -257,6 +257,10 @@ public class DeliveryAdapter {
                             deliveryComboProductInfo.setProductPrice(comboProduct.getSalePrice().intValue());
                             //餐道使用
                             deliveryComboProductInfo.setCumulatedTotal(comboProduct.getNumber() * comboProduct.getSalePrice().intValue());
+                        } else {
+                            deliveryComboProductInfo.setProductPrice(0);
+                            //餐道使用
+                            deliveryComboProductInfo.setCumulatedTotal(0);
                         }
                         OrderProductAddInfoDto orderComboProductAddInfoDto = JSON.parseObject(comboProduct.getAddInfo(), OrderProductAddInfoDto.class);
                         deliveryComboProductInfo.setTaxId(StringUtils.isNotEmpty(orderComboProductAddInfoDto.getTaxId()) ? orderComboProductAddInfoDto.getTaxId() : "10");