Merge remote-tracking branch 'origin/feature/xukang_20211201_虚拟订单退款' into…

Merge remote-tracking branch 'origin/feature/xukang_20211201_虚拟订单退款' into feature/xukang_20211201_虚拟订单退款

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

@@ -3704,8 +3704,10 @@ public class OrderServiceImpl implements Orderservice {
         if (baseOrderResponse == null || !ObjectUtils.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, baseOrderResponse.getErrcode())) {
             throw new ServiceException(ResponseResult.ORDER__ERRORREFUND);
         }
-        //冲正库存
-        stockHandle.revert(null,orderBean);
+        if (Objects.nonNull(state)) {
+            //冲正库存
+            stockHandle.revert(null,orderBean);
+        }
         // 删除订单 通知活动添加商品库存  status 需要老订单的 ordercode
 //        orderQueueService.backOrdersStatusChange(orderBean.getOrderCode(), orderBean.getOrderState(), orderBean.getPayState());
     }

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

@@ -1677,6 +1677,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         shoppingCartClearRequestVo.setUserId(userId);
         shoppingCartClearRequestVo.setShopId(storeId);
         shoppingCartClearRequestVo.setOperationType(OperationTypeEnum.PAY_SUCCESS.getOperationType());
+        // 因为数量限制的问题,不清空购物车缓存
+        if (activityCalculationDiscountResponseDto != null && StringUtils.equals(activityCalculationDiscountResponseDto.getStatusCode(), "80000")) {
+            throw new ServiceException(ResponseResult.SHOPPING_CART_LIMIT_ADD);
+        }
         clear(shoppingCartClearRequestVo);
         if (activityCalculationDiscountResponseDto != null && StringUtils.equals(activityCalculationDiscountResponseDto.getStatusCode(), "103")) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_COUPON_CAN_NOT_USE_THIS_SHOP);