卖券订单调用促销 扣减库存逻辑修改

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

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

@@ -404,16 +404,12 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
                     return ResponseUtil.error(baseResponse.getCode(),"商品库存不足");
                 }
             }
-            ThirdPartyLog.infoConvertJson(System.currentTimeMillis(), System.currentTimeMillis(),
-                    "fisherman activityUpdateStockRequest 01", JSONObject.toJSONString(stockBeanDtos), null);
             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);
-                    ThirdPartyLog.infoConvertJson(System.currentTimeMillis(), System.currentTimeMillis(),
-                            "fisherman activityUpdateStockRequest 02", JSONObject.toJSONString(activityUpdateStockRequest), JSONObject.toJSONString(activityResponse));
                     if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, activityResponse.getStatusCode())) {
                         // 失败取消订单
                         CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
@@ -1073,7 +1069,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
             for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods good : result.getGoods()){
                 if(good.getGoodsId().equals(products.getPid())){
                     if(CollectionUtils.isEmpty(good.getDiscounts())){
-                        return null;
+                        return result.getStocks();
                     }
                     List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> discounts = good.getDiscounts();
                     OrderSettlementCreateReq orderSettlementCreateReq = new OrderSettlementCreateReq();