已删除订单

sd-business/src/main/java/com/sd/business/controller/order/OrderController.java

@@ -78,4 +78,20 @@ public class OrderController {
         return orderService.getSkuSpecPrice(dto);
     }
 
+    /**
+     * 通过sku规格id获取产品价格
+     */
+    @PostMapping("/deletedOrderPage")
+    public Page<OrderInfoVo> deletedOrderPage(@RequestBody OrderSelectDto dto) {
+        return orderService.deletedOrderPage(dto);
+    }
+
+    /**
+     * 通过sku规格id获取产品价格
+     */
+    @PostMapping("/deletedOrderDetail")
+    public OrderInfoVo deletedOrderDetail(@RequestBody BaseSelectDto dto) {
+        return orderService.deletedOrderDetail(dto);
+    }
+
 }

sd-business/src/main/java/com/sd/business/service/order/OrderService.java

@@ -1,6 +1,7 @@
 package com.sd.business.service.order;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.core.service.BaseService;
 import com.sd.business.entity.order.dto.OrderInfoDto;
 import com.sd.business.entity.order.dto.OrderSelectDto;
@@ -54,4 +55,14 @@ public interface OrderService extends BaseService<OrderInfo> {
      */
     String addExceptionType(String exceptionTypeStr, Integer addExceptionType);
 
+    /**
+     * 获取已删除订单
+     */
+    Page<OrderInfoVo> deletedOrderPage(OrderSelectDto dto);
+
+    /**
+     * 已删除订单明细
+     */
+    OrderInfoVo deletedOrderDetail(BaseSelectDto dto);
+
 }

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -6,7 +6,9 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.annotation.LogicIgnore;
 import com.ruoyi.common.constant.StatusConstant;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
@@ -325,4 +327,23 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         return exceptionTypeStr + "," + addExceptionType;
     }
 
+    @LogicIgnore
+    @Override
+    public Page<OrderInfoVo> deletedOrderPage(OrderSelectDto dto) {
+        IWrapper<OrderInfo> wrapper = getWrapper();
+        wrapper.orderByDesc("o", OrderInfo::getId);
+        wrapper.eq("d", Department::getId, dto.getDepartmentId());
+        wrapper.like("o", OrderInfo::getCode, dto.getCode());
+        wrapper.like("o", OrderInfo::getWlnCode, dto.getWlnCode());
+        wrapper.eq("o", OrderInfo::getDelFlag, StatusConstant.DELETED);
+
+        return this.baseMapper.getPage(dto.getPage(), wrapper);
+    }
+
+    @LogicIgnore
+    @Override
+    public OrderInfoVo deletedOrderDetail(BaseSelectDto dto) {
+        return detail(dto.getId());
+    }
+
 }