合并代码报错修改

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

@@ -389,7 +389,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
             DistributeBo distributeBo = new DistributeBo(discountResult, allCartGoodsList, shoppingCartGoodsResponseVo, null
                     , userLoginInfoDto, null, activityQueryDto, menuType, deliveryAmount
-                    , ShoppingCartConstant.ADD_AND_UPDATE, partnerId, SubmitPageEnum.NO.getCode(), userId, storeId,,this.getNightDistributionFee(shoppingCartGoodsResponseVo.getDeliveryAmountList()));
+                    , ShoppingCartConstant.ADD_AND_UPDATE, partnerId, SubmitPageEnum.NO.getCode(), userId, storeId,this.getNightDistributionFee(shoppingCartGoodsResponseVo.getDeliveryAmountList()));
 
             distributeBo.setHasCoupon(StringUtils.isNotBlank(couponCode));
             sharingCartService.distribute(distributeBo);