fix

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/AbstractApportionService.java

@@ -475,7 +475,7 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe
             if (goods!=null) {
                 find = goods.stream().filter((k) -> k.getCartGoodsUid().equals(product.getCartGoodsUid())).findFirst().get();
             }
-            ShoppingCartApportionBO.CartGoodsDetailDto cartGoodsDetailDto = calculationCommonService.convertCartGoods2NewDetailGoodsList(find, product);
+            ShoppingCartApportionBO.CartGoodsDetailDto cartGoodsDetailDto = calculationCommonService.convertCartGoods2NewDetailGoodsList(find, product, baseRequestDTO.getPartnerId());
             cartGoodsDetailDtoList.add(cartGoodsDetailDto);
         }
 

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/PlatformListCartGoodsService.java

@@ -194,7 +194,7 @@ public class PlatformListCartGoodsService extends AbstractListCartGoodsService {
                     , hasGoodssCoupon
                     , couponPromotionVO.getOrderType()
                     , 1
-                    , baseRequestDTO.getAppId()
+                    , baseRequestDTO.getAppId(), baseRequestDTO.getMenuType(), ""
             );
             if (Objects.equals(activityClassifyCouponBean, null)) {
                 // 构建一个空得订单券信息

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/MaterialRequestVo.java

@@ -34,8 +34,5 @@ public class MaterialRequestVo {
      * 麦咖啡入机键位
      */
     private String customerCode;
-    /**
-     * 数量
-     */
-    private Integer qty;
+
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java

@@ -216,12 +216,12 @@ public class CalculationCommonService {
      * @return
      */
     public ShoppingCartApportionBO.CartGoodsDetailDto convertCartGoods2NewDetailGoodsList(CalculationDiscountBO.CalculationDiscountResult.Goods calculationGoods
-            , CartGoods cartGoods) {
+            , CartGoods cartGoods, String partnerId) {
         log.debug("convertCartGoods2DetailGoodsList ->calculationGoods:{},cartGoods:{}", calculationGoods, cartGoods);
 
         CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods oldGoods = mapperFacade.map(calculationGoods, CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.class);
 
-        ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = this.convertCartGoods2DetailGoods(oldGoods, cartGoods);
+        ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = this.convertCartGoods2DetailGoods(oldGoods, cartGoods, partnerId);
 
         ShoppingCartApportionBO.CartGoodsDetailDto newDetail = mapperFacade.map(cartGoodsDetailDto, ShoppingCartApportionBO.CartGoodsDetailDto.class);
         return newDetail;

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/BuyOneGiveOneSendService.java

@@ -130,7 +130,6 @@ public class BuyOneGiveOneSendService {
                 chooseGood.setGoodsName(innerSendGood.getGoodsName());
                 chooseGoods.add(chooseGood);
             });
-
         });
 
         shoppingCartGoodsResponseVo.setChooseGoods(chooseGoods);