优化：混合支付 svc卡全额支付 直接核销优惠券

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

@@ -3776,25 +3776,6 @@ public class OrderAdapter {
         return responseDto;
     }
 
-    /**
-     * 初始化扣减活动库存请求对象
-     * add by miaohui 20201030 for 【ID1018638】【C端服务端】活动库存接口调整对接
-     * @return
-     */
-    private ActivityUpdateStockRequest initActivityUpdateStockRequest(List<ActivityDiscountsDto> activityDiscountsDtos) {
-        // 原逻辑只检测扣减库存不为空时调用，现改为扣减库存不为空或参加活动不为空时调用
-        ActivityUpdateStockRequest activityUpdateStockRequest = new ActivityUpdateStockRequest();
-        List<String> activityList = new ArrayList<>();
-        // 只记录订单级别的活动ID
-        if (CollectionUtils.isNotEmpty(activityDiscountsDtos)) {
-            activityList.addAll(activityDiscountsDtos.stream().filter(ad -> StringUtils.isNotBlank(ad.getActivityCode())).map(ActivityDiscountsDto::getActivityCode).distinct().collect(Collectors.toList()));
-        }
-        //设置活动编号
-        activityUpdateStockRequest.setActivityList(CollectionUtils.isNotEmpty(activityList) ? activityList : null);
-        return activityUpdateStockRequest;
-    }
-
-
     public MultiOrderRefundRequest getMultiOrderPayRefundRequest(QueryOrdersResponseDto.DataBean.OrderBean orderBean, Long refundId) {
         MultiOrderRefundRequest multiQueryRequest = new MultiOrderRefundRequest();
         multiQueryRequest.setStationId("1");

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

@@ -322,7 +322,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , allCartGoodsList
                     , new ArrayList<>() //券
                     , null //加价购商品
-                    , deliveryAmount);
+                    , deliveryAmount,null);
 
             //
             sharingCartService.distribute(discountResult
@@ -443,7 +443,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , cartGoodsList
                     , new ArrayList() //券
                     , null //加价购商品
-                    , deliveryAmount);
+                    , deliveryAmount,null);
 
             sharingCartService.distribute(discountResult
                     , cartGoodsList
@@ -595,7 +595,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , cartGoodsList
                     , coupons
                     , sendGoods
-                    , deliveryAmount);
+                    , deliveryAmount,null);
             sharingCartService.distribute(calculationSharingDiscountResult
                     , cartGoodsList
                     , shoppingCartGoodsResponseVo
@@ -796,7 +796,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , cartGoodsList
                     , coupons
                     , shoppingCartInfoRequestVo.getSendGoods()
-                    , deliveryAmount);
+                    , deliveryAmount,null);
 
             //直接利用促销返回做均摊
             sharingEquallyService.equally(discountResult