餐道价格显示

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

@@ -202,9 +202,9 @@ public class DeliveryAdapter {
                 }
                 deliveryProductInfo.setProductName(productName);
                 deliveryProductInfo.setProductNumber(productList.getNumber());
-                deliveryProductInfo.setProductPrice(productList.getPrice().intValue());
+                deliveryProductInfo.setProductPrice(productList.getSalePrice().intValue());
                 //餐道使用
-                deliveryProductInfo.setCumulatedTotal(productList.getNumber() * productList.getPrice().intValue());
+                deliveryProductInfo.setCumulatedTotal(productList.getNumber() * productList.getSalePrice().intValue());
                 OrderProductAddInfoDto orderProductAddInfoDto = JSON.parseObject(productList.getAddInfo(), OrderProductAddInfoDto.class);
                 deliveryProductInfo.setTaxId(StringUtils.isNotEmpty(orderProductAddInfoDto.getTaxId()) ? orderProductAddInfoDto.getTaxId() : "10");
                 deliveryProductInfo.setTaxRate(orderProductAddInfoDto.getTax() > 0 ? orderProductAddInfoDto.getTax() : 6);
@@ -238,21 +238,44 @@ public class DeliveryAdapter {
                         }
                         deliveryComboProductInfo.setProductName(productNameCombo);
                         deliveryComboProductInfo.setProductNumber(comboProduct.getNumber()/productList.getNumber());
-                        deliveryComboProductInfo.setProductPrice(comboProduct.getPrice().intValue());
+                        deliveryComboProductInfo.setProductPrice(comboProduct.getSalePrice().intValue());
                         //餐道使用
-                        deliveryComboProductInfo.setCumulatedTotal(comboProduct.getNumber() * comboProduct.getPrice().intValue());
+                        deliveryComboProductInfo.setCumulatedTotal(comboProduct.getNumber() * comboProduct.getSalePrice().intValue());
                         OrderProductAddInfoDto orderComboProductAddInfoDto = JSON.parseObject(comboProduct.getAddInfo(), OrderProductAddInfoDto.class);
                         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]));
 
+                        if(CollectionUtils.isNotEmpty(comboProduct.getMaterialProduct())) {
+                            comboProduct.getMaterialProduct().forEach(o -> {
+                                deliveryComboProductInfo.setProductPrice(deliveryComboProductInfo.getProductPrice() + o.getSalePrice().intValue());
+                                //餐道使用
+                                deliveryComboProductInfo.setCumulatedTotal(deliveryComboProductInfo.getCumulatedTotal() + comboProduct.getNumber() * o.getSalePrice().intValue());
+
+                                deliveryProductInfo.setProductPrice(deliveryProductInfo.getProductPrice() + o.getSalePrice().intValue());
+                                //餐道使用
+                                deliveryProductInfo.setCumulatedTotal(deliveryProductInfo.getCumulatedTotal() + comboProduct.getNumber() * o.getSalePrice().intValue());
+                            });
+                        }
+
                         productInfos.add(deliveryComboProductInfo);
                     });
                 }
+
+                if(CollectionUtils.isNotEmpty(productList.getMaterialProduct())) {
+                    productList.getMaterialProduct().forEach(o -> {
+                        deliveryProductInfo.setProductPrice(deliveryProductInfo.getProductPrice() + o.getSalePrice().intValue());
+                        //餐道使用
+                        deliveryProductInfo.setCumulatedTotal(deliveryProductInfo.getCumulatedTotal() + productList.getNumber() * o.getSalePrice().intValue());
+                    });
+                }
             });
             deliveryOrderRequestDto.setProductTotal(productInfos.stream().mapToInt(t -> t.getCumulatedTotal()).sum());
         }
+
+
+
         deliveryOrderRequestDto.setProductInfos(productInfos);
         deliveryOrderRequestDto.setOrderSource(OrderSourceType.ALIPAY.getCode().equals(order.getSource())?"Alipay":"freemud");
         if(CollectionUtils.isNotEmpty(order.getAccountList())) {