订单问题修复

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

@@ -2127,21 +2127,22 @@ public class OrderAdapter {
     }
 
     public CreateOrderProductRequest convent2MCCafeOrderProduct(ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto) {
-        CreateOrderProductRequest createOrderProductDemoDto = convent2MCCafeOrderProductDemo(cartGoodsDetailDto, 0, cartGoodsDetailDto.getProductType());
+        CreateOrderProductRequest createOrderProductDemoDto = convent2MCCafeOrderProductDemo(cartGoodsDetailDto, cartGoodsDetailDto.getProductType());
         if(cartGoodsDetailDto.getProductType() != null) {
             if(cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT.getCode()
                     || cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT_UPPRICE.getCode()) {
+                createOrderProductDemoDto.setPrice(0l);
                 //套餐
                 List<CreateOrderProductRequest> comboProducts = new ArrayList<>();
                 cartGoodsDetailDto.getComboProducts().forEach(product -> {
-                    CreateOrderProductRequest createOrderComboProduct = convent2MCCafeOrderProductDemo(product, product.getOriginalPrice(), cartGoodsDetailDto.getProductType());
+                    CreateOrderProductRequest createOrderComboProduct = convent2MCCafeOrderProductDemo(product, product.getProductType());
                     comboProducts.add(createOrderComboProduct);
                     if(CollectionUtils.isNotEmpty(product.getMaterialList())) {
                         //加料商品
                         List<CreateOrderProductRequest> materialProducts = new ArrayList<>();
                         product.getMaterialList().forEach(cartMaterial -> {
                             product.setProductType(ProductType.MATERIALPRODUCT_UPPRICE.getCode());
-                            materialProducts.add(convent2MCCafeOrderProductDemo(cartMaterial, cartMaterial.getOriginalPrice(), ProductType.LITTLE_MATERIAL_PRODUCT.getCode()));
+                            materialProducts.add(convent2MCCafeOrderProductDemo(cartMaterial, ProductType.LITTLE_MATERIAL_PRODUCT.getCode()));
                         });
                         createOrderComboProduct.setMaterialProduct(materialProducts);
                     }
@@ -2152,7 +2153,7 @@ public class OrderAdapter {
                 List<CreateOrderProductRequest> materialProducts = new ArrayList<>();
                 cartGoodsDetailDto.getMaterialList().forEach(product -> {
                     product.setProductType(ProductType.MATERIALPRODUCT_UPPRICE.getCode());
-                    materialProducts.add(convent2MCCafeOrderProductDemo(product, product.getOriginalPrice(), ProductType.LITTLE_MATERIAL_PRODUCT.getCode()));
+                    materialProducts.add(convent2MCCafeOrderProductDemo(product, ProductType.LITTLE_MATERIAL_PRODUCT.getCode()));
                 });
                 createOrderProductDemoDto.setMaterialProduct(materialProducts);
             }
@@ -2220,13 +2221,13 @@ public class OrderAdapter {
         return createOrderProductDemoDto;
     }
 
-    public CreateOrderProductRequest convent2MCCafeOrderProductDemo(ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto, long price, Integer productType) {
+    public CreateOrderProductRequest convent2MCCafeOrderProductDemo(ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto, Integer productType) {
         CreateOrderProductRequest createOrderProductDemoDto = new CreateOrderProductRequest();
         createOrderProductDemoDto.setProductId(cartGoodsDetailDto.getSpuId());
         createOrderProductDemoDto.setProductName(cartGoodsDetailDto.getSpuName());
         createOrderProductDemoDto.setSpecification(cartGoodsDetailDto.getSkuId());
         createOrderProductDemoDto.setSpecificationName(cartGoodsDetailDto.getSkuName());
-        createOrderProductDemoDto.setPrice(price);
+        createOrderProductDemoDto.setPrice(cartGoodsDetailDto.getOriginalPrice());
         createOrderProductDemoDto.setSalePrice(cartGoodsDetailDto.getOriginalPrice());
         createOrderProductDemoDto.setTotalDiscountAmount(cartGoodsDetailDto.getTotalDiscountAmount() == null ? 0 : cartGoodsDetailDto.getTotalDiscountAmount().longValue());
         createOrderProductDemoDto.setNumber(cartGoodsDetailDto.getQty());