订单修改记录

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

@@ -0,0 +1,37 @@
+package com.sd.business.controller.order;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.order.dto.OrderOperatingLogSelectDto;
+import com.sd.business.entity.order.vo.OrderOperatingLogVo;
+import com.sd.business.service.order.OrderOperatingLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 订单操作日志 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-07-11
+ */
+@RestController
+@RequestMapping("/orderOperatingLog")
+public class OrderOperatingLogController {
+
+    @Autowired
+    private OrderOperatingLogService orderOperatingLogService;
+
+    /**
+     * 订单操作日志分页
+     */
+    @PostMapping("/page")
+    public Page<OrderOperatingLogVo> page(@RequestBody OrderOperatingLogSelectDto dto) {
+        return orderOperatingLogService.getPage(dto);
+    }
+
+}

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

@@ -1,10 +1,6 @@
 package com.sd.business.controller.order;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.sd.business.entity.order.dto.OrderSkuBomDto;
-import com.sd.business.entity.order.dto.OrderSkuBomSelectDto;
-import com.sd.business.entity.order.vo.OrderSkuBomVo;
 import com.sd.business.service.order.OrderSkuBomService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,29 +24,29 @@ public class OrderSkuBomController {
     @Autowired
     private OrderSkuBomService orderSkuBomService;
 
-    /**
-     * 订单sku bom 关联分页
-     */
-    @PostMapping("/page")
-    public Page<OrderSkuBomVo> page(@RequestBody OrderSkuBomSelectDto dto) {
-        return orderSkuBomService.getPage(dto);
-    }
-
-    /**
-     * 订单sku bom 关联明细
-     */
-    @PostMapping("/detail")
-    public OrderSkuBomVo detail(@RequestBody BaseSelectDto dto) {
-        return orderSkuBomService.detail(dto.getId());
-    }
-
-    /**
-     * 订单sku bom 关联新增
-     */
-    @PostMapping("/add")
-    public void add(@RequestBody OrderSkuBomDto orderSkuBomDto) {
-        orderSkuBomService.add(orderSkuBomDto);
-    }
+    // /**
+    //  * 订单sku bom 关联分页
+    //  */
+    // @PostMapping("/page")
+    // public Page<OrderSkuBomVo> page(@RequestBody OrderSkuBomSelectDto dto) {
+    //     return orderSkuBomService.getPage(dto);
+    // }
+    //
+    // /**
+    //  * 订单sku bom 关联明细
+    //  */
+    // @PostMapping("/detail")
+    // public OrderSkuBomVo detail(@RequestBody BaseSelectDto dto) {
+    //     return orderSkuBomService.detail(dto.getId());
+    // }
+    //
+    // /**
+    //  * 订单sku bom 关联新增
+    //  */
+    // @PostMapping("/add")
+    // public void add(@RequestBody OrderSkuBomDto orderSkuBomDto) {
+    //     orderSkuBomService.add(orderSkuBomDto);
+    // }
 
     /**
      * 订单sku bom 关联编辑
@@ -60,12 +56,12 @@ public class OrderSkuBomController {
         orderSkuBomService.edit(orderSkuBomDto);
     }
 
-    /**
-     * 订单sku bom 关联删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        orderSkuBomService.delete(dto.getId());
-    }
+    // /**
+    //  * 订单sku bom 关联删除
+    //  */
+    // @PostMapping("/delete")
+    // public void delete(@RequestBody BaseSelectDto dto) {
+    //     orderSkuBomService.delete(dto.getId());
+    // }
 
 }

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

@@ -1,10 +1,6 @@
 package com.sd.business.controller.order;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.sd.business.entity.order.dto.OrderSkuDto;
-import com.sd.business.entity.order.dto.OrderSkuSelectDto;
-import com.sd.business.entity.order.vo.OrderSkuVo;
 import com.sd.business.service.order.OrderSkuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,29 +24,29 @@ public class OrderSkuController {
     @Autowired
     private OrderSkuService orderSkuService;
 
-    /**
-     * 订单sku分页
-     */
-    @PostMapping("/page")
-    public Page<OrderSkuVo> page(@RequestBody OrderSkuSelectDto dto) {
-        return orderSkuService.getPage(dto);
-    }
-
-    /**
-     * 订单sku明细
-     */
-    @PostMapping("/detail")
-    public OrderSkuVo detail(@RequestBody BaseSelectDto dto) {
-        return orderSkuService.detail(dto.getId());
-    }
-
-    /**
-     * 订单sku新增
-     */
-    @PostMapping("/add")
-    public void add(@RequestBody OrderSkuDto orderSkuDto) {
-        orderSkuService.add(orderSkuDto);
-    }
+    // /**
+    //  * 订单sku分页
+    //  */
+    // @PostMapping("/page")
+    // public Page<OrderSkuVo> page(@RequestBody OrderSkuSelectDto dto) {
+    //     return orderSkuService.getPage(dto);
+    // }
+    //
+    // /**
+    //  * 订单sku明细
+    //  */
+    // @PostMapping("/detail")
+    // public OrderSkuVo detail(@RequestBody BaseSelectDto dto) {
+    //     return orderSkuService.detail(dto.getId());
+    // }
+    //
+    // /**
+    //  * 订单sku新增
+    //  */
+    // @PostMapping("/add")
+    // public void add(@RequestBody OrderSkuDto orderSkuDto) {
+    //     orderSkuService.add(orderSkuDto);
+    // }
 
     /**
      * 订单sku编辑
@@ -60,12 +56,12 @@ public class OrderSkuController {
         orderSkuService.edit(orderSkuDto);
     }
 
-    /**
-     * 订单sku删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        orderSkuService.delete(dto.getId());
-    }
+    // /**
+    //  * 订单sku删除
+    //  */
+    // @PostMapping("/delete")
+    // public void delete(@RequestBody BaseSelectDto dto) {
+    //     orderSkuService.delete(dto.getId());
+    // }
 
 }

sd-business/src/main/java/com/sd/business/entity/order/dto/OrderInfoDto.java

@@ -14,4 +14,9 @@ import lombok.Setter;
 @Setter
 public class OrderInfoDto extends OrderInfo {
 
+    /**
+     * 操作类型
+     */
+    private Integer updateType;
+
 }

sd-business/src/main/java/com/sd/business/entity/order/dto/OrderOperatingLogDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.order.dto;
+
+import com.sd.business.entity.order.po.OrderOperatingLog;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 订单操作日志新增编辑入参实体
+ *
+ * @author
+ * @since 2023-07-11
+ */
+@Getter
+@Setter
+public class OrderOperatingLogDto extends OrderOperatingLog {
+
+}

sd-business/src/main/java/com/sd/business/entity/order/dto/OrderOperatingLogSelectDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.order.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 订单操作日志列表查询入参实体
+ *
+ * @author
+ * @since 2023-07-11
+ */
+@Getter
+@Setter
+public class OrderOperatingLogSelectDto extends BaseSelectDto {
+
+}

sd-business/src/main/java/com/sd/business/entity/order/dto/OrderSkuBomDto.java

@@ -14,4 +14,14 @@ import lombok.Setter;
 @Setter
 public class OrderSkuBomDto extends OrderSkuBom {
 
+    /**
+     * 更新类型
+     */
+    private Integer updateType;
+
+    /**
+     * 订单号
+     */
+    private String orderCode;
+
 }

sd-business/src/main/java/com/sd/business/entity/order/dto/OrderSkuDto.java

@@ -14,4 +14,14 @@ import lombok.Setter;
 @Setter
 public class OrderSkuDto extends OrderSku {
 
+    /**
+     * 更新类型
+     */
+    private Integer updateType;
+
+    /**
+     * 订单号
+     */
+    private String orderCode;
+
 }

sd-business/src/main/java/com/sd/business/entity/order/po/OrderOperatingLog.java

@@ -0,0 +1,36 @@
+package com.sd.business.entity.order.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 订单操作日志
+ * </p>
+ *
+ * @author
+ * @since 2023-07-11
+ */
+@Getter
+@Setter
+@TableName("order_operating_log")
+public class OrderOperatingLog extends BasePo {
+
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+    /**
+     * 类型 10新增 20修改 30删除
+     */
+    private Integer type;
+
+    /**
+     * 订单号
+     */
+    private String orderCode;
+
+}

sd-business/src/main/java/com/sd/business/entity/order/vo/OrderOperatingLogVo.java

@@ -0,0 +1,22 @@
+package com.sd.business.entity.order.vo;
+
+import com.sd.business.entity.order.po.OrderOperatingLog;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 订单操作日志列表查询返回值实体
+ *
+ * @author
+ * @since 2023-07-11
+ */
+@Getter
+@Setter
+public class OrderOperatingLogVo extends OrderOperatingLog {
+
+    /**
+     * 创建人名称
+     */
+    private String userName;
+
+}

sd-business/src/main/java/com/sd/business/mapper/order/OrderOperatingLogMapper.java

@@ -0,0 +1,26 @@
+package com.sd.business.mapper.order;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.order.po.OrderOperatingLog;
+import com.sd.business.entity.order.vo.OrderOperatingLogVo;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 订单操作日志 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-07-11
+ */
+public interface OrderOperatingLogMapper extends BaseMapper<OrderOperatingLog> {
+
+    /**
+     * 订单操作日志分页
+     */
+    Page<OrderOperatingLogVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<OrderOperatingLog> wrapper);
+
+}

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

@@ -0,0 +1,25 @@
+package com.sd.business.service.order;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.service.BaseService;
+import com.sd.business.entity.order.dto.OrderOperatingLogSelectDto;
+import com.sd.business.entity.order.po.OrderOperatingLog;
+import com.sd.business.entity.order.vo.OrderOperatingLogVo;
+
+
+/**
+ * <p>
+ * 订单操作日志 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-07-11
+ */
+public interface OrderOperatingLogService extends BaseService<OrderOperatingLog> {
+
+    /**
+     * 订单操作日志分页
+     */
+    Page<OrderOperatingLogVo> getPage(OrderOperatingLogSelectDto dto);
+
+}

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

@@ -0,0 +1,43 @@
+package com.sd.business.service.order.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.BasePo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.system.utils.UserUtil;
+import com.sd.business.entity.order.dto.OrderOperatingLogSelectDto;
+import com.sd.business.entity.order.po.OrderOperatingLog;
+import com.sd.business.entity.order.vo.OrderOperatingLogVo;
+import com.sd.business.mapper.order.OrderOperatingLogMapper;
+import com.sd.business.service.order.OrderOperatingLogService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 订单操作日志 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-07-11
+ */
+@Service
+public class OrderOperatingLogServiceImpl extends ServiceImpl<OrderOperatingLogMapper, OrderOperatingLog> implements OrderOperatingLogService {
+
+    @Override
+    public Page<OrderOperatingLogVo> getPage(OrderOperatingLogSelectDto dto) {
+        IWrapper<OrderOperatingLog> wrapper = getWrapper();
+        wrapper.orderByDesc("ool", OrderOperatingLog::getId);
+        Page<OrderOperatingLogVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<OrderOperatingLogVo> records = page.getRecords();
+        if (records.size() == 0) {
+            return page;
+        }
+
+        UserUtil.assignmentNickName(records, BasePo::getCreateUser, OrderOperatingLogVo::setUserName);
+        return page;
+    }
+
+}

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

@@ -10,6 +10,7 @@ import com.sd.business.entity.department.po.Department;
 import com.sd.business.entity.order.dto.OrderInfoDto;
 import com.sd.business.entity.order.dto.OrderSelectDto;
 import com.sd.business.entity.order.po.OrderInfo;
+import com.sd.business.entity.order.po.OrderOperatingLog;
 import com.sd.business.entity.order.po.OrderSku;
 import com.sd.business.entity.order.po.OrderSkuBom;
 import com.sd.business.entity.order.vo.OrderInfoVo;
@@ -18,12 +19,14 @@ import com.sd.business.entity.order.vo.OrderSkuVo;
 import com.sd.business.mapper.order.OrderMapper;
 import com.sd.business.service.bom.BomSpecService;
 import com.sd.business.service.department.DepartmentService;
+import com.sd.business.service.order.OrderOperatingLogService;
 import com.sd.business.service.order.OrderService;
 import com.sd.business.service.order.OrderSkuBomService;
 import com.sd.business.service.order.OrderSkuService;
 import com.sd.business.service.sku.SkuSpecService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collections;
 import java.util.List;
@@ -56,6 +59,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
     @Autowired
     private OrderSkuBomService orderSkuBomService;
 
+    @Autowired
+    private OrderOperatingLogService orderOperatingLogService;
+
     @Override
     public Page<OrderInfoVo> getPage(OrderSelectDto dto) {
         IWrapper<OrderInfo> wrapper = getWrapper();
@@ -100,7 +106,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         }
 
         // 订单明细
-        List<OrderSkuVo> orderSkuList = BeanUtil.copyToList(orderSkuService.list(q -> q.eq(OrderSku::getOrderId, id)), OrderSkuVo.class);
+        List<OrderSku> tempOrderSkuList = orderSkuService.list(q -> q.eq(OrderSku::getOrderId, id));
+        List<OrderSkuVo> orderSkuList = BeanUtil.copyToList(tempOrderSkuList, OrderSkuVo.class);
         skuSpecService.attributeAssign(orderSkuList, OrderSkuVo::getSkuSpecId, (item, skuSpec) -> {
             item.setBomSpecId(skuSpec.getBomSpecId());
         });
@@ -111,7 +118,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         result.setOrderSkuList(orderSkuList);
 
         // 包材配件/单品
-        List<OrderSkuBomVo> orderSkuBomList = BeanUtil.copyToList(orderSkuBomService.list(q -> q.eq(OrderSkuBom::getOrderId, id)), OrderSkuBomVo.class);
+        List<OrderSkuBom> tempOrderSkuBomList = orderSkuBomService.list(q -> q.eq(OrderSkuBom::getOrderId, id));
+        List<OrderSkuBomVo> orderSkuBomList = BeanUtil.copyToList(tempOrderSkuBomList, OrderSkuBomVo.class);
         bomSpecService.attributeAssign(orderSkuBomList, OrderSkuBom::getBomSpecId, (item, bomSpec) -> {
             item.setBomSpecName(bomSpec.getName());
         });
@@ -123,19 +131,38 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         return result;
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(OrderInfoDto orderDto) {
         this.save(orderDto);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void edit(OrderInfoDto orderDto) {
         this.updateById(orderDto);
+        OrderOperatingLog orderOperatingLog = new OrderOperatingLog();
+        orderOperatingLog.setType(orderDto.getUpdateType());
+        orderOperatingLog.setOrderId(orderDto.getId());
+        orderOperatingLog.setOrderCode(orderDto.getCode());
+        orderOperatingLogService.save(orderOperatingLog);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void delete(Long id) {
+        OrderInfo orderInfo = getById(id);
+
         this.removeById(id);
+        orderSkuService.remove(q -> q.eq(OrderSku::getOrderId, id));
+        orderSkuBomService.remove(q -> q.eq(OrderSkuBom::getOrderId, id));
+
+
+        OrderOperatingLog orderOperatingLog = new OrderOperatingLog();
+        orderOperatingLog.setType(30);
+        orderOperatingLog.setOrderId(id);
+        orderOperatingLog.setOrderCode(orderInfo.getCode());
+        orderOperatingLogService.save(orderOperatingLog);
     }
 
 }

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

@@ -6,11 +6,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.sd.business.entity.order.dto.OrderSkuBomDto;
 import com.sd.business.entity.order.dto.OrderSkuBomSelectDto;
+import com.sd.business.entity.order.po.OrderOperatingLog;
 import com.sd.business.entity.order.po.OrderSkuBom;
 import com.sd.business.entity.order.vo.OrderSkuBomVo;
 import com.sd.business.mapper.order.OrderSkuBomMapper;
+import com.sd.business.service.order.OrderOperatingLogService;
 import com.sd.business.service.order.OrderSkuBomService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 
 /**
@@ -24,6 +28,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class OrderSkuBomServiceImpl extends ServiceImpl<OrderSkuBomMapper, OrderSkuBom> implements OrderSkuBomService {
 
+    @Autowired
+    private OrderOperatingLogService orderOperatingLogService;
+
     @Override
     public Page<OrderSkuBomVo> getPage(OrderSkuBomSelectDto dto) {
         IWrapper<OrderSkuBom> wrapper = getWrapper();
@@ -44,9 +51,15 @@ public class OrderSkuBomServiceImpl extends ServiceImpl<OrderSkuBomMapper, Order
         this.save(orderSkuBomDto);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void edit(OrderSkuBomDto orderSkuBomDto) {
         this.updateById(orderSkuBomDto);
+        OrderOperatingLog orderOperatingLog = new OrderOperatingLog();
+        orderOperatingLog.setType(orderSkuBomDto.getUpdateType());
+        orderOperatingLog.setOrderId(orderSkuBomDto.getOrderId());
+        orderOperatingLog.setOrderCode(orderOperatingLog.getOrderCode());
+        orderOperatingLogService.save(orderOperatingLog);
     }
 
     @Override

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

@@ -6,11 +6,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.sd.business.entity.order.dto.OrderSkuDto;
 import com.sd.business.entity.order.dto.OrderSkuSelectDto;
+import com.sd.business.entity.order.po.OrderOperatingLog;
 import com.sd.business.entity.order.po.OrderSku;
 import com.sd.business.entity.order.vo.OrderSkuVo;
 import com.sd.business.mapper.order.OrderSkuMapper;
+import com.sd.business.service.order.OrderOperatingLogService;
 import com.sd.business.service.order.OrderSkuService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 
 /**
@@ -24,6 +28,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class OrderSkuServiceImpl extends ServiceImpl<OrderSkuMapper, OrderSku> implements OrderSkuService {
 
+    @Autowired
+    private OrderOperatingLogService orderOperatingLogService;
+
     @Override
     public Page<OrderSkuVo> getPage(OrderSkuSelectDto dto) {
         IWrapper<OrderSku> wrapper = getWrapper();
@@ -44,9 +51,15 @@ public class OrderSkuServiceImpl extends ServiceImpl<OrderSkuMapper, OrderSku> i
         this.save(orderSkuDto);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void edit(OrderSkuDto orderSkuDto) {
         this.updateById(orderSkuDto);
+        OrderOperatingLog orderOperatingLog = new OrderOperatingLog();
+        orderOperatingLog.setType(orderSkuDto.getUpdateType());
+        orderOperatingLog.setOrderId(orderSkuDto.getOrderId());
+        orderOperatingLog.setOrderCode(orderSkuDto.getOrderCode());
+        orderOperatingLogService.save(orderOperatingLog);
     }
 
     @Override

sd-business/src/main/resources/mapper/order/OrderOperatingLogMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sd.business.mapper.order.OrderOperatingLogMapper">
+    <select id="getPage" resultType="com.sd.business.entity.order.vo.OrderOperatingLogVo">
+        select ool.id,
+               ool.order_id,
+               ool.type,
+               ool.create_user,
+               ool.create_time,
+               ool.update_user,
+               ool.update_time
+        from order_operating_log ool
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

sd-wln/src/main/java/com/sd/wln/service/impl/WlnOrderServiceImpl.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.fjhx.tenant.entity.dict.po.DictCommonData;
 import com.fjhx.tenant.service.dict.DictCommonDataService;
+import com.ruoyi.framework.mybatis.holder.LogicHolder;
 import com.sd.business.entity.department.po.Department;
 import com.sd.business.entity.order.enums.OrderStatusEnum;
 import com.sd.business.entity.order.po.OrderInfo;
@@ -73,9 +74,12 @@ public class WlnOrderServiceImpl implements WlnOrderService {
             return false;
         }
 
+        // 不排除逻辑删除的订单
+        LogicHolder.setLogicHolder(new LogicHolder());
         // 查询近3天已存在数据库中的订单
         Map<String, OrderInfo> orderMap = orderService.mapKEntity(OrderInfo::getWlnUid,
                 q -> q.between(OrderInfo::getWlnApproveTime, DateUtil.offsetDay(endDate, -3), endDate));
+        LogicHolder.clear();
 
         // 查询事业部
         Map<String, Department> departmentMap = getDepartmentMap();