依据促销 设置 套餐划线价展示问题

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

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

@@ -3009,19 +3009,20 @@ public class OrderSdkAdapter {
             orderItemCreateReq.setSettlementPrice(settlementPrice);
             totalOriginalProductAmount = weightPrice.longValue();
         } else {
-            Long settlementPrice = product.getPrice() * product.getNumber() - totalDiscountAmount;
+            Long productPrice = product.getPrice() * product.getNumber();
+            Long settlementPrice = productPrice - totalDiscountAmount;
             orderItemCreateReq.setSalePrice(settlementPrice / product.getNumber());
             orderItemCreateReq.setSettlementPrice(settlementPrice);
             /**
              * 套餐商品
-             * 套餐原价 = 子商品总原价（称重菜原价*重量+普通商品原价*数量+可选商品原价*数量）
+             * 套餐原价 = 子商品总原价（称重菜原价*重量+普通商品原价*数量+可选商品原价*数量）   fisherman 新算价改动,套餐原价直接取 促销给的值, (因为套餐划线价问题)
              * 套餐结算价 = (套餐价设置为0) ？所有子商品结算价和 * 套餐数量 : 套餐原价*套餐数量-优惠价
              * 套餐售价 = 套餐结算价 / 套餐数量
              */
             if (ProductTypeEnum.SETMEAL_PRODUCT.getCode().equals(product.getProductType()) || ProductTypeEnum.SETMEAL_UPPRICE_PRODUCT.getCode().equals(product.getProductType())) {
                 if (CollectionUtils.isNotEmpty(product.getComboProduct())) {
                     // 套餐原价
-                    Long setmealProductTotalOriginalAmount = 0L;
+//                    Long setmealProductTotalOriginalAmount = 0L;
                     // 套餐结算价
                     Long setmealTotalSettlementPrice = 0L;
                     for (CreateOrderProductRequest createOrderProductRequest : product.getComboProduct()) {
@@ -3035,21 +3036,21 @@ public class OrderSdkAdapter {
                             Double weightPrice = createOrderProductRequest.getPrice() * weight;
                             Long comboSettlementPrice = weightPrice == 0 ? 0 : weightPrice.longValue() - comboProductTotalDiscountAmount;
                             setmealTotalSettlementPrice += comboSettlementPrice;
-                            setmealProductTotalOriginalAmount += weightPrice.longValue();
+//                            setmealProductTotalOriginalAmount += weightPrice.longValue();
                         } else {
                             Long numberPrice = createOrderProductRequest.getPrice() * createOrderProductRequest.getNumber();
                             Long comboSettlementPrice = numberPrice - comboProductTotalDiscountAmount;
                             setmealTotalSettlementPrice += comboSettlementPrice;
-                            setmealProductTotalOriginalAmount += numberPrice;
+//                            setmealProductTotalOriginalAmount += numberPrice;
                         }
                     }
-                    // 套餐原价
-                    orderItemCreateReq.setProductPrice(setmealProductTotalOriginalAmount / product.getNumber());
+                    // 套餐原价  fisherman 新算价改动,套餐原价直接取 促销给的值, (因为套餐划线价问题)
+                    orderItemCreateReq.setProductPrice(productPrice);
                     // 如果套餐没有设置价格取子商品结算价和，否则取套餐自身的结算价
                     setmealTotalSettlementPrice = product.getPrice() == 0 ? setmealTotalSettlementPrice : settlementPrice;
                     orderItemCreateReq.setSettlementPrice(setmealTotalSettlementPrice);
                     orderItemCreateReq.setSalePrice(setmealTotalSettlementPrice / product.getNumber());
-                    totalOriginalProductAmount = setmealProductTotalOriginalAmount;
+//                    totalOriginalProductAmount = setmealProductTotalOriginalAmount;
                 }
             }
         }

shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java

@@ -197,7 +197,6 @@ public class ShoppingCartController {
             return shoppingCartDemoController.getShoppingCartGoodsApportion(getShoppingCartGoodsApportionRequestVo);
         } else {
             BaseResponse<ShoppingCartGoodsDto> shoppingCartGoods = instanceByRequest.getShoppingCartGoods(shoppingCartInfoRequestVo, getShoppingCartGoodsApportionRequestVo.getPremiumExchangeActivity());
-            ShoppingSdkLogUtil.infoLog("fisherman getShoppingCartGoodsApportion", JSON.toJSONString(shoppingCartGoods));
             return shoppingCartGoods;
         }
     }