管理端删除订单

src/main/java/com/chuanghai/ihotel/controller/HotelOrderController.java

@@ -14,12 +14,11 @@ import com.chuanghai.ihotel.constant.RedisKey;
 import com.chuanghai.ihotel.controller.request.ConfrimOrderRequest;
 import com.chuanghai.ihotel.controller.request.OrderQueryRequest;
 import com.chuanghai.ihotel.controller.request.SubmitOrderRequest;
-import com.chuanghai.ihotel.entity.HotelOrderEntity;
+import com.chuanghai.ihotel.dto.LoginUserDTO;
 import com.chuanghai.ihotel.service.HotelOrderService;
 import com.chuanghai.ihotel.util.CommonUtil;
 import com.chuanghai.ihotel.vo.AdminOrderIndexVO;
 import com.chuanghai.ihotel.vo.ConfirmOrderVO;
-import com.chuanghai.ihotel.dto.LoginUserDTO;
 import com.chuanghai.ihotel.vo.OrderBillHandleVO;
 import com.chuanghai.ihotel.vo.OrderSubmitTokenVO;
 import com.chuanghai.ihotel.vo.OrderSubmitVO;
@@ -207,6 +206,20 @@ public class HotelOrderController {
     }
 
     /**
+     * 删除订单【管理端】
+     * @param adminToken 管理员token
+     * @param orderId 订单id
+     * @return
+     */
+    @AdminLoginCheck
+    @DeleteMapping("admin/order/{orderId}")
+    public CommonResult<String> adminDeleteOrder(@RequestHeader("admin_token") String adminToken,
+                                                @PathVariable("orderId") Long orderId) {
+        hotelOrderService.adminDeleteOrder(orderId);
+        return CommonResult.ok();
+    }
+
+    /**
      * 取消订单
      * @param userToken 用户token
      * @param orderId 订单id

src/main/java/com/chuanghai/ihotel/service/HotelOrderService.java

@@ -117,6 +117,12 @@ public interface HotelOrderService extends IService<HotelOrderEntity> {
     void userDeleteOrder(Long orderId);
 
     /**
+     * 管理员删除订单
+     * @param orderId
+     */
+    void adminDeleteOrder(Long orderId);
+
+    /**
      * 用户取消订单
      * @param orderId
      */

src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java

@@ -509,7 +509,18 @@ public class HotelOrderServiceImpl extends ServiceImpl<HotelOrderDao, HotelOrder
     public void userDeleteOrder(Long orderId) {
         HotelOrderEntity order = userGetOrderById(orderId);
 
-        String orderStatu = order.getOrderStatu();
+        deleteOrder(order);
+    }
+
+    @Override
+    public void adminDeleteOrder(Long orderId) {
+        HotelOrderEntity orderEntity = this.getById(orderId);
+
+        deleteOrder(orderEntity);
+    }
+
+    private void deleteOrder(HotelOrderEntity orderEntity) {
+        String orderStatu = orderEntity.getOrderStatu();
 
         // 已取消、待支付、已完成订单才可以被删除
         if (!(OrderStatuEnum.CANCEL.getCode().equalsIgnoreCase(orderStatu)
@@ -519,7 +530,7 @@ public class HotelOrderServiceImpl extends ServiceImpl<HotelOrderDao, HotelOrder
         }
 
         UpdateWrapper<HotelOrderEntity> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id", orderId);
+        updateWrapper.eq("id", orderEntity.getId());
         updateWrapper.set("delete_flag", "0"); // 0表示删除
         updateWrapper.last("limit 1");