Merge branches 'feature/20210717_买虚拟商品特价_wuping' and 'master' of…

Merge branches 'feature/20210717_买虚拟商品特价_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

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

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

@@ -57,6 +57,7 @@ import com.freemud.application.sdk.api.productcenter.response.menu.GetMenuCatego
 import com.freemud.application.sdk.api.productcenter.response.product.GetProductInfosResponse;
 import com.freemud.application.sdk.api.productcenter.service.MenuService;
 import com.freemud.application.sdk.api.promotioncenter.request.promotion.ActivityUpdateStockRequest;
+import com.freemud.application.sdk.api.promotioncenter.response.PromotionResponseDTO;
 import com.freemud.application.sdk.api.stockapi.request.UpdateStocksRequest;
 import com.freemud.application.sdk.api.stockapi.service.StockSdkService;
 import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
@@ -213,7 +214,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 +243,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()))) {
+                    PromotionResponseDTO activityResponse = promotionDiscountClient.subtractStock(activityUpdateStockRequest);
+                    if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, activityResponse.getStatusCode())) {
+                        // 失败取消订单
+                        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(),"活动库存不足");
+                    }
+                }
+            }
 
         }
 

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

@@ -24,6 +24,7 @@ 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 com.freemud.application.sdk.api.promotioncenter.response.PromotionResponseDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -100,5 +101,5 @@ public interface PromotionDiscountClient {
      * 扣减活动库存
      */
     @PostMapping("/activity/stock/subtractStock")
-    BaseResponse subtractStock(@RequestBody ActivityUpdateStockRequest activityReq);
+    PromotionResponseDTO subtractStock(@RequestBody ActivityUpdateStockRequest activityReq);
 }