Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -62,6 +62,7 @@ import cn.freemud.management.intercept.OrderServiceException;
 import cn.freemud.management.service.handle.ActivityHandle;
 import cn.freemud.management.service.handle.OrderVerifyHandle;
 import cn.freemud.management.service.handle.PaymentHandle;
+import cn.freemud.management.service.handle.StockHandle;
 import cn.freemud.manager.OrderManager;
 import cn.freemud.manager.OrderTackCodeManager;
 import cn.freemud.manager.SpellGroupOrderDataManager;
@@ -290,7 +291,8 @@ public class OrderServiceImpl implements Orderservice {
     private OrderVerifyHandle orderVerifyHandle;
     @Autowired
     private PaymentHandle paymentHandle;
-
+    @Autowired
+    private StockHandle stockHandle;
 //    @Override
 //    public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) {
 //        String trackingNo = LogThreadLocal.getTrackingNo();
@@ -3652,6 +3654,8 @@ 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);
         // 删除订单 通知活动添加商品库存  status 需要老订单的 ordercode
 //        orderQueueService.backOrdersStatusChange(orderBean.getOrderCode(), orderBean.getOrderState(), orderBean.getPayState());
     }