Merge branch 'dev'

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/OrderLogController.java

+package org.dromara.server.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.server.domain.bo.OrderLogBo;
+import org.dromara.server.domain.vo.OrderLogVo;
+import org.dromara.server.service.IOrderLogService;
+import org.springframework.validation.annotation.Validated;
+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;
+
+import java.util.List;
+
+/**
+ * 订单第三方接口调用日志
+ * 前端访问路由地址为:/server/orderLog
+ *
+ * @author hzh
+ * @date 2025-06-27
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/orderLog")
+public class OrderLogController extends BaseController {
+
+    private final IOrderLogService orderLogService;
+
+    /**
+     * 查询订单第三方接口调用日志列表
+     */
+    @PostMapping("/list")
+    public R<List<OrderLogVo>> list(@RequestBody OrderLogBo bo) {
+        return R.ok(orderLogService.queryList(bo));
+    }
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/airport/AirportController.java

@@ -49,15 +49,18 @@ import org.dromara.common.ys.model.res.comomResource.AirportModel;
 import org.dromara.common.ys.service.IAirportService;
 import org.dromara.common.ys.service.ICommonResourceService;
 import org.dromara.common.ys.service.IInsuranceService;
+import org.dromara.order.api.enums.OrderType;
 import org.dromara.server.base.BaseController;
 import org.dromara.server.domain.bo.OrderAirportBo;
 import org.dromara.server.domain.bo.OrderAirportRefundBo;
+import org.dromara.server.domain.bo.OrderLogBo;
 import org.dromara.server.domain.vo.OrderAirportRefundVo;
 import org.dromara.server.domain.vo.OrderAirportVo;
 import org.dromara.server.dubbo.RemoteYsOrderServiceImpl;
 import org.dromara.server.service.IOrderAirportChangeService;
 import org.dromara.server.service.IOrderAirportRefundService;
 import org.dromara.server.service.IOrderAirportService;
+import org.dromara.server.util.OrderLogUtil;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -187,6 +190,15 @@ public class AirportController extends BaseController {
         List<org.dromara.common.ys.model.res.airport.BookOrderModel> orderList = airportService.bookOrder(getUserId(), model);
         //添加到订单表
         orderAirportService.batchSaveOrder(getUserId(), travelNo, StreamUtils.toList(orderList, org.dromara.common.ys.model.res.airport.BookOrderModel::getOrderNo));
+        //添加日志
+        OrderLogUtil.log(new OrderLogBo()
+            .setOrderNo(orderList.get(0).getOrderNo())
+            .setOrderType(OrderType.AIRPORT.getType())
+            .setLogType(OrderLogUtil.LogType.CREATE.name())
+            .setReqParams(JSON.toJSONString(model))
+            .setResParams(JSON.toJSONString(orderList))
+            .setSuccess(true)
+        );
         return R.ok(orderList);
     }
 

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/hotel/HotelController.java

 package org.dromara.server.controller.hotel;
 
 
+import com.alibaba.fastjson.JSON;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
@@ -12,11 +13,14 @@ import org.dromara.common.ys.common.PageInfo;
 import org.dromara.common.ys.constant.TripType;
 import org.dromara.common.ys.model.res.hotel.*;
 import org.dromara.common.ys.service.IHotelService;
+import org.dromara.order.api.enums.OrderType;
 import org.dromara.server.base.BaseController;
 import org.dromara.server.domain.bo.OrderHotelBo;
+import org.dromara.server.domain.bo.OrderLogBo;
 import org.dromara.server.domain.vo.OrderHotelVo;
 import org.dromara.server.dubbo.RemoteYsOrderServiceImpl;
 import org.dromara.server.service.IOrderHotelService;
+import org.dromara.server.util.OrderLogUtil;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -75,6 +79,15 @@ public class HotelController extends BaseController {
         model.setTripType(Integer.parseInt(LoginHelper.isVirtual() ? TripType.PRIVATE.getCode() : TripType.PUBLIC.getCode()));
         HotelOrderBookModel book = hotelService.orderBook(getUserId(), model);
         orderHotelService.batchSaveOrder(getUserId(), subjectCode, List.of(book.getOrderId()));
+        //添加日志
+        OrderLogUtil.log(new OrderLogBo()
+            .setOrderNo(book.getOrderId())
+            .setOrderType(OrderType.HOTEL.getType())
+            .setLogType(OrderLogUtil.LogType.CREATE.name())
+            .setReqParams(JSON.toJSONString(model))
+                .setResParams(JSON.toJSONString(book))
+            .setSuccess(true)
+        );
         return R.ok(book);
     }
 

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/train/TrainController.java

@@ -29,7 +29,9 @@ import org.dromara.common.ys.model.res.train.TrainStopModel;
 import org.dromara.common.ys.model.res.train.*;
 import org.dromara.common.ys.service.ICommonResourceService;
 import org.dromara.common.ys.service.ITrainService;
+import org.dromara.order.api.enums.OrderType;
 import org.dromara.server.base.BaseController;
+import org.dromara.server.domain.bo.OrderLogBo;
 import org.dromara.server.domain.bo.OrderTrainBo;
 import org.dromara.server.domain.bo.OrderTrainRefundBo;
 import org.dromara.server.domain.vo.OrderTrainRefundVo;
@@ -38,6 +40,7 @@ import org.dromara.server.dubbo.RemoteYsOrderServiceImpl;
 import org.dromara.server.service.IOrderTrainChangeService;
 import org.dromara.server.service.IOrderTrainRefundService;
 import org.dromara.server.service.IOrderTrainService;
+import org.dromara.server.util.OrderLogUtil;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -221,6 +224,15 @@ public class TrainController extends BaseController {
         model.setTripType(Integer.parseInt(LoginHelper.isVirtual() ? TripType.PRIVATE.getCode() : TripType.PUBLIC.getCode()));
         OrderBookResModel res = trainService.bookOrder(getUserId(), model);
         orderTrainService.batchSaveOrder(getUserId(),subjectCode, List.of(res.getOrderId()));
+        //添加日志
+        OrderLogUtil.log(new OrderLogBo()
+            .setOrderNo(res.getOrderId())
+            .setOrderType(OrderType.TRAIN.getType())
+            .setLogType(OrderLogUtil.LogType.CREATE.name())
+            .setReqParams(JSON.toJSONString(model))
+            .setResParams(JSON.toJSONString(res))
+            .setSuccess(true)
+        );
         return R.ok(res);
     }
 

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/vehicle/VehiclesController.java

 package org.dromara.server.controller.vehicle;
 
 
+import com.alibaba.fastjson.JSON;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
@@ -16,11 +17,14 @@ import org.dromara.common.ys.model.req.vehicles.EstimateYyycPriceModel;
 import org.dromara.common.ys.model.req.vehicles.OrderDetailModel;
 import org.dromara.common.ys.model.res.vehicles.*;
 import org.dromara.common.ys.service.IVehiclesService;
+import org.dromara.order.api.enums.OrderType;
 import org.dromara.server.base.BaseController;
+import org.dromara.server.domain.bo.OrderLogBo;
 import org.dromara.server.domain.bo.OrderVehiclesBo;
 import org.dromara.server.domain.vo.OrderVehiclesVo;
 import org.dromara.server.dubbo.RemoteYsOrderServiceImpl;
 import org.dromara.server.service.IOrderVehiclesService;
+import org.dromara.server.util.OrderLogUtil;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -89,6 +93,15 @@ public class VehiclesController extends BaseController {
         model.setSubjectCode(null);
         OrderBookJsycModel order = vehiclesService.bookJsyc(getUserId(), model);
         orderVehiclesService.saveOrder(getUserId(), subjectCode, order.getOrderId(), order.getOrderNo());
+        //添加日志
+        OrderLogUtil.log(new OrderLogBo()
+            .setOrderNo(order.getOrderNo())
+            .setOrderType(OrderType.CAR.getType())
+            .setLogType(OrderLogUtil.LogType.CREATE.name())
+            .setReqParams(JSON.toJSONString(model))
+            .setResParams(JSON.toJSONString(order))
+            .setSuccess(true)
+        );
         return R.ok(order);
     }
 
@@ -103,6 +116,15 @@ public class VehiclesController extends BaseController {
         model.setSubjectCode(null);
         OrderBookYyycModel order = vehiclesService.bookYyyc(getUserId(), model);
         orderVehiclesService.saveOrder(getUserId(), subjectCode, order.getOrderId(), order.getOrderNo());
+        //添加日志
+        OrderLogUtil.log(new OrderLogBo()
+            .setOrderNo(order.getOrderNo())
+            .setOrderType(OrderType.CAR.getType())
+            .setLogType(OrderLogUtil.LogType.CREATE.name())
+            .setReqParams(JSON.toJSONString(model))
+            .setResParams(JSON.toJSONString(order))
+            .setSuccess(true)
+        );
         return R.ok(order);
     }
 

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/OrderLog.java

+package org.dromara.server.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.util.Date;
+
+/**
+ * 订单第三方接口调用日志对象 biz_order_log
+ *
+ * @author hzh
+ * @date 2025-06-27
+ */
+@Data
+@TableName("biz_order_log")
+public class OrderLog {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 订单类型
+     */
+    private String orderType;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+    /**
+     * 请求参数
+     */
+    private String reqParams;
+
+    /**
+     * 响应参数
+     */
+    private String resParams;
+
+    /**
+     * 接口类型
+     */
+    private String logType;
+
+    /**
+     * 是否成功
+     */
+    private Boolean success;
+
+    /**
+     * 错误信息
+     */
+    private String errorMsg;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/bo/OrderLogBo.java

+package org.dromara.server.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.server.domain.OrderLog;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 订单第三方接口调用日志业务对象 biz_order_log
+ *
+ * @author hzh
+ * @date 2025-06-27
+ */
+@Data
+@Accessors(chain = true)
+@AutoMapper(target = OrderLog.class, reverseConvertGenerate = false)
+public class OrderLogBo  {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 订单类型
+     */
+    @NotBlank(message = "订单类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String orderType;
+
+    /**
+     * 订单编号
+     */
+    @NotBlank(message = "订单编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String orderNo;
+
+    /**
+     * 请求参数
+     */
+    @NotBlank(message = "请求参数不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String reqParams;
+
+    /**
+     * 响应参数
+     */
+    private String resParams;
+
+    /**
+     * 接口类型
+     */
+    @NotBlank(message = "接口类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String logType;
+
+    /**
+     * 是否成功
+     */
+    @NotNull(message = "是否成功不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Boolean success;
+
+    /**
+     * 错误信息
+     */
+    private String errorMsg;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 请求参数
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/OrderLogVo.java

+package org.dromara.server.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.server.domain.OrderLog;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 订单第三方接口调用日志视图对象 biz_order_log
+ *
+ * @author hzh
+ * @date 2025-06-27
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = OrderLog.class)
+public class OrderLogVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ExcelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 订单类型
+     */
+    @ExcelProperty(value = "订单类型")
+    private String orderType;
+
+    /**
+     * 订单编号
+     */
+    @ExcelProperty(value = "订单编号")
+    private String orderNo;
+
+    /**
+     * 请求参数
+     */
+    @ExcelProperty(value = "请求参数")
+    private String reqParams;
+
+    /**
+     * 响应参数
+     */
+    private String resParams;
+
+    /**
+     * 接口类型
+     */
+    @ExcelProperty(value = "接口类型")
+    private String logType;
+
+    /**
+     * 是否成功
+     */
+    @ExcelProperty(value = "是否成功")
+    private Boolean success;
+
+    /**
+     * 错误信息
+     */
+    @ExcelProperty(value = "错误信息")
+    private String errorMsg;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/dubbo/RemoteYsOrderServiceImpl.java

 package org.dromara.server.dubbo;
 
 
+import com.alibaba.fastjson.JSON;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -22,6 +23,7 @@ import org.dromara.server.api.domain.RemoteOrderApprove;
 import org.dromara.server.domain.bo.*;
 import org.dromara.server.domain.vo.*;
 import org.dromara.server.service.*;
+import org.dromara.server.util.OrderLogUtil;
 import org.dromara.system.api.RemoteUserService;
 import org.springframework.stereotype.Service;
 
@@ -193,50 +195,89 @@ public class RemoteYsOrderServiceImpl implements RemoteYsOrderService {
     }
 
     private void pay(String orderType, String orderNo) {
+        OrderLogBo orderLog = new OrderLogBo()
+            .setSuccess(true)
+            .setOrderType(orderType)
+            .setOrderNo(orderNo);
         if (StringUtils.equals(orderType, OrderType.AIRPORT.getType())) {
             //飞机票
             Optional.ofNullable(orderAirportService.getOne(new OrderAirportBo().setOrderNo(orderNo))).ifPresent(vo -> {
+                orderLog.setLogType(OrderLogUtil.LogType.PAY.name());
                 try {
                     //飞机票支付
-                    airportService.payOrder(vo.getPersonCode(), new OrderPayModel().setOrderNo(orderNo));
+                    OrderPayModel model = new OrderPayModel().setOrderNo(orderNo);
+                    airportService.payOrder(vo.getPersonCode(), model);
+                    orderLog.setReqParams(JSON.toJSONString(model));
+                    OrderLogUtil.log(orderLog);
                 } catch (Exception e) {
                     log.error("飞机票支付失败,orderNo:{},失败原因：{}", orderNo, e.getMessage());
+                    orderLog.setSuccess(false);
+                    orderLog.setErrorMsg(e.getMessage());
+                    OrderLogUtil.log(orderLog);
                 }
+                orderLog.setLogType(OrderLogUtil.LogType.CONFIRM.name());
                 try {
                     //确认出票
-                    airportService.confirmOrder(vo.getPersonCode(), new OrderConfirmModel().setOrderNo(orderNo).setAutoDraw(1));
+                    OrderConfirmModel model = new OrderConfirmModel().setOrderNo(orderNo).setAutoDraw(1);
+                    airportService.confirmOrder(vo.getPersonCode(), model);
+                    orderLog.setReqParams(JSON.toJSONString(model));
+                    OrderLogUtil.log(orderLog);
                 } catch (Exception e) {
                     log.error("飞机票确认出票失败,orderNo:{},失败原因：{}", orderNo, e.getMessage());
+                    orderLog.setSuccess(false);
+                    orderLog.setErrorMsg(e.getMessage());
+                    OrderLogUtil.log(orderLog);
                 }
                 orderAirportService.updateOrderInfo(List.of(orderNo));
             });
         } else if (StringUtils.equals(orderType, OrderType.TRAIN.getType())) {
             //火车票
             Optional.ofNullable(orderTrainService.getOne(new OrderTrainBo().setOrderNo(orderNo))).ifPresent(vo -> {
+                orderLog.setLogType(OrderLogUtil.LogType.PAY.name());
                 try {
                     //火车票支付
-                    trainService.payOrder(vo.getPersonCode(), new org.dromara.common.ys.model.req.train.PayOrderModel().setOrderNo(orderNo));
+                    org.dromara.common.ys.model.req.train.PayOrderModel model = new org.dromara.common.ys.model.req.train.PayOrderModel().setOrderNo(orderNo);
+                    trainService.payOrder(vo.getPersonCode(), model);
+                    orderLog.setReqParams(JSON.toJSONString(model));
+                    OrderLogUtil.log(orderLog);
                 } catch (Exception e) {
                     log.error("火车票支付失败,orderNo:{},失败原因：{}", orderNo, e.getMessage());
+                    orderLog.setSuccess(false);
+                    orderLog.setErrorMsg(e.getMessage());
+                    OrderLogUtil.log(orderLog);
                 }
+                orderLog.setLogType(OrderLogUtil.LogType.CONFIRM.name());
                 try {
                     //确认出票
-                    trainService.confirmOrder(vo.getPersonCode(), new ConfirmOrderModel().setOrderNo(orderNo));
+                    ConfirmOrderModel model = new ConfirmOrderModel().setOrderNo(orderNo);
+                    trainService.confirmOrder(vo.getPersonCode(), model);
+                    orderLog.setReqParams(JSON.toJSONString(model));
+                    OrderLogUtil.log(orderLog);
                 } catch (Exception e) {
                     log.error("火车票确认出票失败,orderNo:{},失败原因：{}", orderNo, e.getMessage());
+                    orderLog.setSuccess(false);
+                    orderLog.setErrorMsg(e.getMessage());
+                    OrderLogUtil.log(orderLog);
                 }
                 orderTrainService.updateOrderInfo(List.of(orderNo));
             });
         } else if (StringUtils.equals(orderType, OrderType.CAR.getType())) {
 
         } else if (StringUtils.equals(orderType, OrderType.HOTEL.getType())) {
+            orderLog.setLogType(OrderLogUtil.LogType.CONFIRM.name());
             //酒店
             Optional.ofNullable(orderHotelService.getOne(new OrderHotelBo().setOrderNo(orderNo))).ifPresent(vo -> {
                 try {
                     //确认出票
-                    hotelService.orderPay(vo.getPersonCode(), new PayOrderModel().setOrderNo(orderNo));
+                    PayOrderModel model = new PayOrderModel().setOrderNo(orderNo);
+                    hotelService.orderPay(vo.getPersonCode(), model);
+                    orderLog.setReqParams(JSON.toJSONString(model));
+                    OrderLogUtil.log(orderLog);
                 } catch (Exception e) {
                     log.error("酒店确认出票失败,orderNo:{},失败原因：{}", orderNo, e.getMessage());
+                    orderLog.setSuccess(false);
+                    orderLog.setErrorMsg(e.getMessage());
+                    OrderLogUtil.log(orderLog);
                 }
                 orderHotelService.updateOrderInfo(List.of(orderNo));
             });

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/mapper/OrderLogMapper.java

+package org.dromara.server.mapper;
+
+import org.dromara.server.domain.OrderLog;
+import org.dromara.server.domain.vo.OrderLogVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 订单第三方接口调用日志Mapper接口
+ *
+ * @author hzh
+ * @date 2025-06-27
+ */
+public interface OrderLogMapper extends BaseMapperPlus<OrderLog, OrderLogVo> {
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/IOrderLogService.java

+package org.dromara.server.service;
+
+import org.dromara.server.domain.OrderLog;
+import org.dromara.server.domain.vo.OrderLogVo;
+import org.dromara.server.domain.bo.OrderLogBo;
+import org.dromara.server.domain.OrderLog;
+import org.dromara.common.mybatis.service.IBaseService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单第三方接口调用日志Service接口
+ *
+ * @author hzh
+ * @date 2025-06-27
+ */
+public interface IOrderLogService extends IBaseService<OrderLogVo, OrderLogBo, OrderLog>{
+
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderLogServiceImpl.java

+package org.dromara.server.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.common.mybatis.service.AbstractBaseService;
+import org.dromara.server.domain.OrderLog;
+import org.dromara.server.domain.bo.OrderLogBo;
+import org.dromara.server.domain.vo.OrderLogVo;
+import org.dromara.server.mapper.OrderLogMapper;
+import org.dromara.server.service.IOrderLogService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 订单第三方接口调用日志Service业务层处理
+ *
+ * @author hzh
+ * @date 2025-06-27
+ */
+@RequiredArgsConstructor
+@Service
+public class OrderLogServiceImpl extends AbstractBaseService<OrderLogVo, OrderLogBo, OrderLog> implements IOrderLogService {
+
+    private final OrderLogMapper baseMapper;
+
+    @Override
+    public BaseMapperPlus<OrderLog, OrderLogVo> mapper() {
+        return baseMapper;
+    }
+
+    @Override
+    public LambdaQueryWrapper<OrderLog> buildQueryWrapper(OrderLogBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<OrderLog> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getOrderType()), OrderLog::getOrderType, bo.getOrderType());
+        lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), OrderLog::getOrderNo, bo.getOrderNo());
+        lqw.eq(StringUtils.isNotBlank(bo.getReqParams()), OrderLog::getReqParams, bo.getReqParams());
+        lqw.eq(StringUtils.isNotBlank(bo.getLogType()), OrderLog::getLogType, bo.getLogType());
+        lqw.eq(bo.getSuccess() != null, OrderLog::getSuccess, bo.getSuccess());
+        lqw.eq(StringUtils.isNotBlank(bo.getErrorMsg()), OrderLog::getErrorMsg, bo.getErrorMsg());
+        Object orderNoList = params.get("orderNoList");
+        if (orderNoList != null) {
+            lqw.in(OrderLog::getOrderNo, JSON.parseArray(JSON.toJSONString(orderNoList), String.class));
+        }
+        return lqw;
+    }
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/util/OrderLogUtil.java

+package org.dromara.server.util;
+
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.server.domain.bo.OrderLogBo;
+import org.dromara.server.service.IOrderLogService;
+
+import java.util.Date;
+
+/**
+ * @author hzh
+ * @date 2025-06-27
+ **/
+public class OrderLogUtil {
+
+    /**
+     * 添加日志
+     *
+     * @param log log
+     */
+    public static void log(OrderLogBo log) {
+        log.setId(null);
+        IOrderLogService service = SpringUtils.getBean(IOrderLogService.class);
+        log.setCreateTime(new Date());
+        service.insertByBo(log);
+    }
+
+    /**
+     * 日志类型
+     */
+    public enum LogType {
+        CREATE,
+        PAY,
+        CONFIRM
+    }
+
+}

ruoyi-modules/ruoyi-server/src/main/resources/mapper/server/OrderLogMapper.xml

+<?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="org.dromara.server.mapper.OrderLogMapper">
+
+</mapper>

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/OrderApproveController.java

@@ -18,6 +18,8 @@ import org.dromara.workflow.service.IOrderApproveService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 订单审批
  * 前端访问路由地址为:/workflow/orderApprove
@@ -42,6 +44,17 @@ public class OrderApproveController extends BaseController {
         return orderApproveService.queryPageList(bo, pageQuery);
     }
 
+    /**
+     * 公共接口
+     *
+     * @param bo 查询参数
+     * @return 数据
+     */
+    @PostMapping("/commonList")
+    public R<List<OrderApproveVo>> commonList(@RequestBody OrderApproveBo bo) {
+        return R.ok(orderApproveService.queryList(bo));
+    }
+
     /**
      * 获取订单审批详细信息
      *

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/OrderApproveServiceImpl.java

 package org.dromara.workflow.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
@@ -68,6 +69,10 @@ public class OrderApproveServiceImpl extends AbstractBaseService<OrderApproveVo,
         lqw.eq(bo.getExpireTime() != null, OrderApprove::getExpireTime, bo.getExpireTime());
         lqw.eq(StringUtils.isNotBlank(bo.getInfo()), OrderApprove::getInfo, bo.getInfo());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), OrderApprove::getStatus, bo.getStatus());
+        Object orderNoList = params.get("orderNoList");
+        if (orderNoList != null) {
+            lqw.in(OrderApprove::getOrderNo, JSON.parseArray(JSON.toJSONString(orderNoList), String.class));
+        }
         return lqw;
     }