代码合并错误修改

order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java

@@ -213,7 +213,7 @@ public class SellCouponOrderServiceImpl {
 
         CreateOrderRequest createOrderRequest = (CreateOrderRequest) createOrderRequestResponse.getResult();
         //标准化平台虚拟商品特价活动计算，不包含蜜雪APP买虚拟商品
-        List<ActivityUpdateStockRequest.StockBeanDto> stockBeanDtos = calculationDiscount(partnerId, storeId, userLoginInfoDto.getMemberId(), productInfosDto.getData().getProducts().get(0), createOrderRequest);
+//        List<ActivityUpdateStockRequest.StockBeanDto> stockBeanDtos = calculationDiscount(partnerId, storeId, userLoginInfoDto.getMemberId(), productInfosDto.getData().getProducts().get(0), createOrderRequest);
 
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse<OrderInfoReqs> orderInfoReqsBaseResponse = orderSdkService.createOrder(createOrderRequest, trackingNo);
         CreateOrderResponse createOrderResponse = orderSdkAdapter.convent2NEWOrderInfoReqs(orderInfoReqsBaseResponse);
@@ -242,21 +242,21 @@ public class SellCouponOrderServiceImpl {
                     return ResponseUtil.error(baseResponse.getCode(),"商品库存不足");
                 }
             }
-            if(CollectionUtils.isNotEmpty(stockBeanDtos)){
-                // 扣减活动库存
-                ActivityUpdateStockRequest activityUpdateStockRequest = orderSdkAdapter.convert2ActivityUpdateStockRequest(orderBean, stockBeanDtos);
-                // 原逻辑只检测扣减库存不为空时调用，现改为扣减库存不为空或参加活动不为空时调用
-                if (activityUpdateStockRequest != null && (CollectionUtils.isNotEmpty(activityUpdateStockRequest.getStock()) || CollectionUtils.isNotEmpty(activityUpdateStockRequest.getActivityList()))) {
-                    BaseResponse activityResponse = promotionDiscountClient.subtractStock(activityUpdateStockRequest);
-                    if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, activityResponse.getCode())) {
-                        // 失败取消订单
-                        CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                                AfterSalesType.SYSTEM_CANCEL, "活动库存不足", "", null);
-                        BaseOrderResponse orderResponse = orderCenterSdkService.orderCancel(cancelOrderRequest);
-                        return ResponseUtil.error(ResponseResult.ORDER_CREATE_ERROR.getCode(),"活动库存不足");
-                    }
-                }
-            }
+//            if(CollectionUtils.isNotEmpty(stockBeanDtos)){
+//                // 扣减活动库存
+//                ActivityUpdateStockRequest activityUpdateStockRequest = orderSdkAdapter.convert2ActivityUpdateStockRequest(orderBean, stockBeanDtos);
+//                // 原逻辑只检测扣减库存不为空时调用，现改为扣减库存不为空或参加活动不为空时调用
+//                if (activityUpdateStockRequest != null && (CollectionUtils.isNotEmpty(activityUpdateStockRequest.getStock()) || CollectionUtils.isNotEmpty(activityUpdateStockRequest.getActivityList()))) {
+//                    BaseResponse activityResponse = promotionDiscountClient.subtractStock(activityUpdateStockRequest);
+//                    if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, activityResponse.getCode())) {
+//                        // 失败取消订单
+//                        CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
+//                                AfterSalesType.SYSTEM_CANCEL, "活动库存不足", "", null);
+//                        BaseOrderResponse orderResponse = orderCenterSdkService.orderCancel(cancelOrderRequest);
+//                        return ResponseUtil.error(ResponseResult.ORDER_CREATE_ERROR.getCode(),"活动库存不足");
+//                    }
+//                }
+//            }
 
         }