套餐价格不重新计算

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -2731,7 +2731,7 @@ public class OrderSdkAdapter {
         for (CreateOrderProductRequest productRequest : products) {
             // 普通商品 订单转换
             productRequest.setOpid(index);
-            originalAmount += updateOrderItemAndSettlement(productRequest, orderItemList, orderSettlementCreateReqList, productRequest, partnerId, "", false);
+            originalAmount += updateMCCafeOrderItemAndSettlement(productRequest, orderItemList, orderSettlementCreateReqList, productRequest, partnerId, "", false);
             // 如果是套餐商品，需要转换当前商品行子集ComboProduct&GroupProduct（固定商品、可选商品）
             if (ObjectUtils.equals(ProductTypeEnum.SETMEAL_PRODUCT.getCode(), productRequest.getProductType()) || ObjectUtils.equals(ProductTypeEnum.SETMEAL_UPPRICE_PRODUCT.getCode(), productRequest.getProductType())) {
                 // 父类商品productId=productId+seq
@@ -2739,13 +2739,13 @@ public class OrderSdkAdapter {
                 if (CollectionUtils.isNotEmpty(productRequest.getComboProduct())) {
                     for(CreateOrderProductRequest combo : productRequest.getComboProduct()) {
                         combo.setOpid(comboIndex);
-                        updateOrderItemAndSettlement(productRequest, orderItemList, orderSettlementCreateReqList, combo, partnerId, parentProductId, false);
+                        updateMCCafeOrderItemAndSettlement(productRequest, orderItemList, orderSettlementCreateReqList, combo, partnerId, parentProductId, false);
                         if(CollectionUtils.isNotEmpty(combo.getMaterialProduct())) {
                             String addProductId = combo.getProductId() + "_" + comboIndex;
                             for(CreateOrderProductRequest material : combo.getMaterialProduct()) {
                                 material.setSpecification(material.getProductId());
                                 material.setSpecificationName(material.getProductName());
-                                updateOrderItemAndSettlement(productRequest, orderItemList, orderSettlementCreateReqList, material, partnerId, addProductId, true);
+                                updateMCCafeOrderItemAndSettlement(productRequest, orderItemList, orderSettlementCreateReqList, material, partnerId, addProductId, true);
                             }
                         }
                         comboIndex++;
@@ -2757,7 +2757,7 @@ public class OrderSdkAdapter {
                 for (CreateOrderProductRequest material: productRequest.getMaterialProduct()){
                     material.setSpecification(material.getProductId());
                     material.setSpecificationName(material.getProductName());
-                    updateOrderItemAndSettlement(productRequest, orderItemList, orderSettlementCreateReqList, material, partnerId, addProductId, true);
+                    updateMCCafeOrderItemAndSettlement(productRequest, orderItemList, orderSettlementCreateReqList, material, partnerId, addProductId, true);
                 }
             }
             index++;