接口服务错误修改

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

@@ -160,8 +160,6 @@ public class SellCouponOrderServiceImpl {
     @Autowired
     private PromotionDiscountClient promotionDiscountClient;
 
-    @Autowired
-    private PromotionActivityClient promotionActivityClient;
 
     /**
      * 卖券订单创建
@@ -249,7 +247,7 @@ public class SellCouponOrderServiceImpl {
                 ActivityUpdateStockRequest activityUpdateStockRequest = orderSdkAdapter.convert2ActivityUpdateStockRequest(orderBean, stockBeanDtos);
                 // 原逻辑只检测扣减库存不为空时调用，现改为扣减库存不为空或参加活动不为空时调用
                 if (activityUpdateStockRequest != null && (CollectionUtils.isNotEmpty(activityUpdateStockRequest.getStock()) || CollectionUtils.isNotEmpty(activityUpdateStockRequest.getActivityList()))) {
-                    BaseResponse activityResponse = promotionActivityClient.subtractStock(activityUpdateStockRequest);
+                    BaseResponse activityResponse = promotionDiscountClient.subtractStock(activityUpdateStockRequest);
                     if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, activityResponse.getCode())) {
                         // 失败取消订单
                         CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),

order-application-service/src/main/java/cn/freemud/service/thirdparty/PromotionActivityClient.java

@@ -102,10 +102,4 @@ public interface PromotionActivityClient {
     @PostMapping("/activities/share/queryValidShareActivity")
     BaseResponse queryValidShareActivity(@RequestBody QueryValidShareActivityReq activityReq);
 
-    /**
-     * 扣减活动库存
-     */
-    @PostMapping("/activity/stock/subtractStock")
-    BaseResponse subtractStock(@RequestBody ActivityUpdateStockRequest activityReq);
-
 }

order-application-service/src/main/java/cn/freemud/service/thirdparty/PromotionDiscountClient.java

@@ -12,6 +12,7 @@
  */
 package cn.freemud.service.thirdparty;
 
+import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.constant.ResponseCodeKeyConstant;
 import cn.freemud.entities.dto.ActivityCalculationDiscountRequestDto;
@@ -21,6 +22,7 @@ import cn.freemud.entities.dto.activity.ActivityQueryResponseDto;
 import cn.freemud.entities.dto.promotion.*;
 import cn.freemud.entities.vo.QueryGroupHistoryRequest;
 import cn.freemud.entities.vo.QuerySpellGroupRequest;
+import com.freemud.application.sdk.api.promotioncenter.request.promotion.ActivityUpdateStockRequest;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -86,5 +88,9 @@ public interface PromotionDiscountClient {
     @PostMapping("/activity/groupWork/queryHistory")
     QueryHistoryGroupVOResponse queryHistory(QueryGroupHistoryRequest querySpellGroupRequest);
 
-
+    /**
+     * 扣减活动库存
+     */
+    @PostMapping("/activity/stock/subtractStock")
+    BaseResponse subtractStock(@RequestBody ActivityUpdateStockRequest activityReq);
 }