订单取消添加判断

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/AdminTradeOrderServiceImpl.java

@@ -358,6 +358,11 @@ public class AdminTradeOrderServiceImpl implements AdminTradeOrderService {
     public CommonResult<?> cancelOrder(Long orderId) {
         TradeOrderDO tradeOrderDO = tradeOrderRepositoryService.getById(orderId);
         Asserts.isTrue(tradeOrderDO != null, "订单不存在");
+        Integer orderStatus = tradeOrderDO.getOrderStatus();
+        if(orderStatus!=TradeOrderStatusEnum.UNPAID.getStatus() && orderStatus!=TradeOrderStatusEnum.PAYING.getStatus()
+                && orderStatus!=TradeOrderStatusEnum.YD.getStatus() && orderStatus!=TradeOrderStatusEnum.INIT.getStatus()){
+            return CommonResult.error(100001,"订单状态不支持取消");
+        }
         TradeOrderBindDO tradeOrderBindDO = new TradeOrderBindDO();
         tradeOrderBindDO.setId(IdWorker.getId());
         tradeOrderBindDO.setType(1);