`fix`

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/controller/TblGoodsOrderController.java

@@ -0,0 +1,105 @@
+package org.dromara.system.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.system.domain.vo.TblGoodsOrderVo;
+import org.dromara.system.domain.bo.TblGoodsOrderBo;
+import org.dromara.system.service.ITblGoodsOrderService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 寄货订单
+ *
+ * @author Lion Li
+ * @date 2024-04-01
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/goodsOrder")
+public class TblGoodsOrderController extends BaseController {
+
+    private final ITblGoodsOrderService tblGoodsOrderService;
+
+    /**
+     * 查询寄货订单列表
+     */
+    @SaCheckPermission("system:goodsOrder:list")
+    @GetMapping("/list")
+    public TableDataInfo<TblGoodsOrderVo> list(TblGoodsOrderBo bo, PageQuery pageQuery) {
+        return tblGoodsOrderService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出寄货订单列表
+     */
+    @SaCheckPermission("system:goodsOrder:export")
+    @Log(title = "寄货订单", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TblGoodsOrderBo bo, HttpServletResponse response) {
+        List<TblGoodsOrderVo> list = tblGoodsOrderService.queryList(bo);
+        ExcelUtil.exportExcel(list, "寄货订单", TblGoodsOrderVo.class, response);
+    }
+
+    /**
+     * 获取寄货订单详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:goodsOrder:query")
+    @GetMapping("/{id}")
+    public R<TblGoodsOrderVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(tblGoodsOrderService.queryById(id));
+    }
+
+    /**
+     * 新增寄货订单
+     */
+    @SaCheckPermission("system:goodsOrder:add")
+    @Log(title = "寄货订单", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TblGoodsOrderBo bo) {
+        return toAjax(tblGoodsOrderService.insertByBo(bo));
+    }
+
+    /**
+     * 修改寄货订单
+     */
+    @SaCheckPermission("system:goodsOrder:edit")
+    @Log(title = "寄货订单", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TblGoodsOrderBo bo) {
+        return toAjax(tblGoodsOrderService.updateByBo(bo));
+    }
+
+    /**
+     * 删除寄货订单
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:goodsOrder:remove")
+    @Log(title = "寄货订单", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(tblGoodsOrderService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/controller/TblTaxiOrderController.java

@@ -0,0 +1,105 @@
+package org.dromara.system.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.system.domain.vo.TblTaxiOrderVo;
+import org.dromara.system.domain.bo.TblTaxiOrderBo;
+import org.dromara.system.service.ITblTaxiOrderService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 打车订单
+ *
+ * @author Lion Li
+ * @date 2024-04-01
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/taxiOrder")
+public class TblTaxiOrderController extends BaseController {
+
+    private final ITblTaxiOrderService tblTaxiOrderService;
+
+    /**
+     * 查询打车订单列表
+     */
+    @SaCheckPermission("system:taxiOrder:list")
+    @GetMapping("/list")
+    public TableDataInfo<TblTaxiOrderVo> list(TblTaxiOrderBo bo, PageQuery pageQuery) {
+        return tblTaxiOrderService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出打车订单列表
+     */
+    @SaCheckPermission("system:taxiOrder:export")
+    @Log(title = "打车订单", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TblTaxiOrderBo bo, HttpServletResponse response) {
+        List<TblTaxiOrderVo> list = tblTaxiOrderService.queryList(bo);
+        ExcelUtil.exportExcel(list, "打车订单", TblTaxiOrderVo.class, response);
+    }
+
+    /**
+     * 获取打车订单详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:taxiOrder:query")
+    @GetMapping("/{id}")
+    public R<TblTaxiOrderVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(tblTaxiOrderService.queryById(id));
+    }
+
+    /**
+     * 新增打车订单
+     */
+    @SaCheckPermission("system:taxiOrder:add")
+    @Log(title = "打车订单", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TblTaxiOrderBo bo) {
+        return toAjax(tblTaxiOrderService.insertByBo(bo));
+    }
+
+    /**
+     * 修改打车订单
+     */
+    @SaCheckPermission("system:taxiOrder:edit")
+    @Log(title = "打车订单", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TblTaxiOrderBo bo) {
+        return toAjax(tblTaxiOrderService.updateByBo(bo));
+    }
+
+    /**
+     * 删除打车订单
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:taxiOrder:remove")
+    @Log(title = "打车订单", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(tblTaxiOrderService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/TblGoodsOrder.java

@@ -0,0 +1,93 @@
+package org.dromara.system.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 寄货订单对象 tbl_goods_order
+ *
+ * @author Lion Li
+ * @date 2024-04-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tbl_goods_order")
+public class TblGoodsOrder extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    private String orderId;
+
+    /**
+     * 货主
+     */
+    private Long fromUserId;
+
+    /**
+     * 货物类型
+     */
+    private Long goodsType;
+
+    /**
+     * 0-待支付 1-待上车 2-运输中 3-完成 4-取消
+     */
+    private Long status;
+
+    /**
+     * 出发地
+     */
+    private String fromAddr;
+
+    /**
+     * 出发时间
+     */
+    private Date gotime;
+
+    /**
+     * 货物重量
+     */
+    private String goodsWeight;
+
+    /**
+     * 目的地
+     */
+    private String toAddr;
+
+    /**
+     * 1-线下支付 2-微信支付
+     */
+    private String payType;
+
+    /**
+     * 货物描述
+     */
+    private String goodsDes;
+
+    /**
+     * 扩展1
+     */
+    private String ext1;
+
+    /**
+     * 扩展2
+     */
+    private String ext2;
+
+
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/TblTaxiOrder.java

@@ -0,0 +1,83 @@
+package org.dromara.system.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 打车订单对象 tbl_taxi_order
+ *
+ * @author Lion Li
+ * @date 2024-04-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tbl_taxi_order")
+public class TblTaxiOrder extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    private String orderId;
+
+    /**
+     * 乘客
+     */
+    private Long fromUserId;
+
+    /**
+     * 司机
+     */
+    private Long toUserId;
+
+    /**
+     * 0-待接单 1-已接单 2-取消 3-完成
+     */
+    private Long status;
+
+    /**
+     * 出发地
+     */
+    private String fromAddr;
+
+    /**
+     * 出发时间
+     */
+    private Date gotime;
+
+    /**
+     * 乘车人数
+     */
+    private Long peoNum;
+
+    /**
+     * 目的地
+     */
+    private String toAddr;
+
+    /**
+     * 扩展1
+     */
+    private String ext1;
+
+    /**
+     * 扩展2
+     */
+    private String ext2;
+
+
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/bo/TblGoodsOrderBo.java

@@ -0,0 +1,91 @@
+package org.dromara.system.domain.bo;
+
+import org.dromara.system.domain.TblGoodsOrder;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 寄货订单业务对象 tbl_goods_order
+ *
+ * @author Lion Li
+ * @date 2024-04-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = TblGoodsOrder.class, reverseConvertGenerate = false)
+public class TblGoodsOrderBo extends BaseEntity {
+
+    /**
+     * 编号
+     */
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    private String orderId;
+
+    /**
+     * 货主
+     */
+    private Long fromUserId;
+
+    /**
+     * 货物类型
+     */
+    private Long goodsType;
+
+    /**
+     * 0-待支付 1-待上车 2-运输中 3-完成 4-取消
+     */
+    private Long status;
+
+    /**
+     * 出发地
+     */
+    private String fromAddr;
+
+    /**
+     * 出发时间
+     */
+    private Date gotime;
+
+    /**
+     * 货物重量
+     */
+    private String goodsWeight;
+
+    /**
+     * 目的地
+     */
+    private String toAddr;
+
+    /**
+     * 1-线下支付 2-微信支付
+     */
+    private String payType;
+
+    /**
+     * 货物描述
+     */
+    private String goodsDes;
+
+    /**
+     * 扩展1
+     */
+    private String ext1;
+
+    /**
+     * 扩展2
+     */
+    private String ext2;
+
+
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/bo/TblTaxiOrderBo.java

@@ -0,0 +1,81 @@
+package org.dromara.system.domain.bo;
+
+import org.dromara.system.domain.TblTaxiOrder;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 打车订单业务对象 tbl_taxi_order
+ *
+ * @author Lion Li
+ * @date 2024-04-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = TblTaxiOrder.class, reverseConvertGenerate = false)
+public class TblTaxiOrderBo extends BaseEntity {
+
+    /**
+     * 编号
+     */
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    private String orderId;
+
+    /**
+     * 乘客
+     */
+    private Long fromUserId;
+
+    /**
+     * 司机
+     */
+    private Long toUserId;
+
+    /**
+     * 0-待接单 1-已接单 2-取消 3-完成
+     */
+    private Long status;
+
+    /**
+     * 出发地
+     */
+    private String fromAddr;
+
+    /**
+     * 出发时间
+     */
+    private Date gotime;
+
+    /**
+     * 乘车人数
+     */
+    private Long peoNum;
+
+    /**
+     * 目的地
+     */
+    private String toAddr;
+
+    /**
+     * 扩展1
+     */
+    private String ext1;
+
+    /**
+     * 扩展2
+     */
+    private String ext2;
+
+
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/vo/TblGoodsOrderVo.java

@@ -0,0 +1,112 @@
+package org.dromara.system.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.system.domain.TblGoodsOrder;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 寄货订单视图对象 tbl_goods_order
+ *
+ * @author Lion Li
+ * @date 2024-04-01
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = TblGoodsOrder.class)
+public class TblGoodsOrderVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @ExcelProperty(value = "编号")
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    @ExcelProperty(value = "订单号")
+    private String orderId;
+
+    /**
+     * 货主
+     */
+    @ExcelProperty(value = "货主")
+    private Long fromUserId;
+
+    /**
+     * 货物类型
+     */
+    @ExcelProperty(value = "货物类型")
+    private Long goodsType;
+
+    /**
+     * 0-待支付 1-待上车 2-运输中 3-完成 4-取消
+     */
+    @ExcelProperty(value = "0-待支付 1-待上车 2-运输中 3-完成 4-取消")
+    private Long status;
+
+    /**
+     * 出发地
+     */
+    @ExcelProperty(value = "出发地")
+    private String fromAddr;
+
+    /**
+     * 出发时间
+     */
+    @ExcelProperty(value = "出发时间")
+    private Date gotime;
+
+    /**
+     * 货物重量
+     */
+    @ExcelProperty(value = "货物重量")
+    private String goodsWeight;
+
+    /**
+     * 目的地
+     */
+    @ExcelProperty(value = "目的地")
+    private String toAddr;
+
+    /**
+     * 1-线下支付 2-微信支付
+     */
+    @ExcelProperty(value = "1-线下支付 2-微信支付")
+    private String payType;
+
+    /**
+     * 货物描述
+     */
+    @ExcelProperty(value = "货物描述")
+    private String goodsDes;
+
+    /**
+     * 扩展1
+     */
+    @ExcelProperty(value = "扩展1")
+    private String ext1;
+
+    /**
+     * 扩展2
+     */
+    @ExcelProperty(value = "扩展2")
+    private String ext2;
+
+
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/vo/TblTaxiOrderVo.java

@@ -0,0 +1,100 @@
+package org.dromara.system.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.system.domain.TblTaxiOrder;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 打车订单视图对象 tbl_taxi_order
+ *
+ * @author Lion Li
+ * @date 2024-04-01
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = TblTaxiOrder.class)
+public class TblTaxiOrderVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @ExcelProperty(value = "编号")
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    @ExcelProperty(value = "订单号")
+    private String orderId;
+
+    /**
+     * 乘客
+     */
+    @ExcelProperty(value = "乘客")
+    private Long fromUserId;
+
+    /**
+     * 司机
+     */
+    @ExcelProperty(value = "司机")
+    private Long toUserId;
+
+    /**
+     * 0-待接单 1-已接单 2-取消 3-完成
+     */
+    @ExcelProperty(value = "0-待接单 1-已接单 2-取消 3-完成")
+    private Long status;
+
+    /**
+     * 出发地
+     */
+    @ExcelProperty(value = "出发地")
+    private String fromAddr;
+
+    /**
+     * 出发时间
+     */
+    @ExcelProperty(value = "出发时间")
+    private Date gotime;
+
+    /**
+     * 乘车人数
+     */
+    @ExcelProperty(value = "乘车人数")
+    private Long peoNum;
+
+    /**
+     * 目的地
+     */
+    @ExcelProperty(value = "目的地")
+    private String toAddr;
+
+    /**
+     * 扩展1
+     */
+    @ExcelProperty(value = "扩展1")
+    private String ext1;
+
+    /**
+     * 扩展2
+     */
+    @ExcelProperty(value = "扩展2")
+    private String ext2;
+
+
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/mapper/TblGoodsOrderMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper;
+
+import org.dromara.system.domain.TblGoodsOrder;
+import org.dromara.system.domain.vo.TblGoodsOrderVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 寄货订单Mapper接口
+ *
+ * @author Lion Li
+ * @date 2024-04-01
+ */
+public interface TblGoodsOrderMapper extends BaseMapperPlus<TblGoodsOrder, TblGoodsOrderVo> {
+
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/mapper/TblTaxiOrderMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper;
+
+import org.dromara.system.domain.TblTaxiOrder;
+import org.dromara.system.domain.vo.TblTaxiOrderVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 打车订单Mapper接口
+ *
+ * @author Lion Li
+ * @date 2024-04-01
+ */
+public interface TblTaxiOrderMapper extends BaseMapperPlus<TblTaxiOrder, TblTaxiOrderVo> {
+
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/service/ITblGoodsOrderService.java

@@ -0,0 +1,49 @@
+package org.dromara.system.service;
+
+import org.dromara.system.domain.TblGoodsOrder;
+import org.dromara.system.domain.vo.TblGoodsOrderVo;
+import org.dromara.system.domain.bo.TblGoodsOrderBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 寄货订单Service接口
+ *
+ * @author Lion Li
+ * @date 2024-04-01
+ */
+public interface ITblGoodsOrderService {
+
+    /**
+     * 查询寄货订单
+     */
+    TblGoodsOrderVo queryById(Long id);
+
+    /**
+     * 查询寄货订单列表
+     */
+    TableDataInfo<TblGoodsOrderVo> queryPageList(TblGoodsOrderBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询寄货订单列表
+     */
+    List<TblGoodsOrderVo> queryList(TblGoodsOrderBo bo);
+
+    /**
+     * 新增寄货订单
+     */
+    Boolean insertByBo(TblGoodsOrderBo bo);
+
+    /**
+     * 修改寄货订单
+     */
+    Boolean updateByBo(TblGoodsOrderBo bo);
+
+    /**
+     * 校验并批量删除寄货订单信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/service/ITblTaxiOrderService.java

@@ -0,0 +1,49 @@
+package org.dromara.system.service;
+
+import org.dromara.system.domain.TblTaxiOrder;
+import org.dromara.system.domain.vo.TblTaxiOrderVo;
+import org.dromara.system.domain.bo.TblTaxiOrderBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 打车订单Service接口
+ *
+ * @author Lion Li
+ * @date 2024-04-01
+ */
+public interface ITblTaxiOrderService {
+
+    /**
+     * 查询打车订单
+     */
+    TblTaxiOrderVo queryById(Long id);
+
+    /**
+     * 查询打车订单列表
+     */
+    TableDataInfo<TblTaxiOrderVo> queryPageList(TblTaxiOrderBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询打车订单列表
+     */
+    List<TblTaxiOrderVo> queryList(TblTaxiOrderBo bo);
+
+    /**
+     * 新增打车订单
+     */
+    Boolean insertByBo(TblTaxiOrderBo bo);
+
+    /**
+     * 修改打车订单
+     */
+    Boolean updateByBo(TblTaxiOrderBo bo);
+
+    /**
+     * 校验并批量删除打车订单信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/service/impl/TblGoodsOrderServiceImpl.java

@@ -0,0 +1,120 @@
+package org.dromara.system.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.system.domain.bo.TblGoodsOrderBo;
+import org.dromara.system.domain.vo.TblGoodsOrderVo;
+import org.dromara.system.domain.TblGoodsOrder;
+import org.dromara.system.mapper.TblGoodsOrderMapper;
+import org.dromara.system.service.ITblGoodsOrderService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 寄货订单Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2024-04-01
+ */
+@RequiredArgsConstructor
+@Service
+public class TblGoodsOrderServiceImpl implements ITblGoodsOrderService {
+
+    private final TblGoodsOrderMapper baseMapper;
+
+    /**
+     * 查询寄货订单
+     */
+    @Override
+    public TblGoodsOrderVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询寄货订单列表
+     */
+    @Override
+    public TableDataInfo<TblGoodsOrderVo> queryPageList(TblGoodsOrderBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<TblGoodsOrder> lqw = buildQueryWrapper(bo);
+        Page<TblGoodsOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询寄货订单列表
+     */
+    @Override
+    public List<TblGoodsOrderVo> queryList(TblGoodsOrderBo bo) {
+        LambdaQueryWrapper<TblGoodsOrder> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<TblGoodsOrder> buildQueryWrapper(TblGoodsOrderBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<TblGoodsOrder> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getOrderId()), TblGoodsOrder::getOrderId, bo.getOrderId());
+        lqw.eq(bo.getFromUserId() != null, TblGoodsOrder::getFromUserId, bo.getFromUserId());
+        lqw.eq(bo.getGoodsType() != null, TblGoodsOrder::getGoodsType, bo.getGoodsType());
+        lqw.eq(bo.getStatus() != null, TblGoodsOrder::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getFromAddr()), TblGoodsOrder::getFromAddr, bo.getFromAddr());
+        lqw.eq(bo.getGotime() != null, TblGoodsOrder::getGotime, bo.getGotime());
+        lqw.eq(StringUtils.isNotBlank(bo.getGoodsWeight()), TblGoodsOrder::getGoodsWeight, bo.getGoodsWeight());
+        lqw.eq(StringUtils.isNotBlank(bo.getToAddr()), TblGoodsOrder::getToAddr, bo.getToAddr());
+        lqw.eq(StringUtils.isNotBlank(bo.getPayType()), TblGoodsOrder::getPayType, bo.getPayType());
+        lqw.eq(StringUtils.isNotBlank(bo.getGoodsDes()), TblGoodsOrder::getGoodsDes, bo.getGoodsDes());
+        lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblGoodsOrder::getExt1, bo.getExt1());
+        lqw.eq(StringUtils.isNotBlank(bo.getExt2()), TblGoodsOrder::getExt2, bo.getExt2());
+        return lqw;
+    }
+
+    /**
+     * 新增寄货订单
+     */
+    @Override
+    public Boolean insertByBo(TblGoodsOrderBo bo) {
+        TblGoodsOrder add = MapstructUtils.convert(bo, TblGoodsOrder.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改寄货订单
+     */
+    @Override
+    public Boolean updateByBo(TblGoodsOrderBo bo) {
+        TblGoodsOrder update = MapstructUtils.convert(bo, TblGoodsOrder.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(TblGoodsOrder entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除寄货订单
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/service/impl/TblTaxiOrderServiceImpl.java

@@ -0,0 +1,118 @@
+package org.dromara.system.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.system.domain.bo.TblTaxiOrderBo;
+import org.dromara.system.domain.vo.TblTaxiOrderVo;
+import org.dromara.system.domain.TblTaxiOrder;
+import org.dromara.system.mapper.TblTaxiOrderMapper;
+import org.dromara.system.service.ITblTaxiOrderService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 打车订单Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2024-04-01
+ */
+@RequiredArgsConstructor
+@Service
+public class TblTaxiOrderServiceImpl implements ITblTaxiOrderService {
+
+    private final TblTaxiOrderMapper baseMapper;
+
+    /**
+     * 查询打车订单
+     */
+    @Override
+    public TblTaxiOrderVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询打车订单列表
+     */
+    @Override
+    public TableDataInfo<TblTaxiOrderVo> queryPageList(TblTaxiOrderBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<TblTaxiOrder> lqw = buildQueryWrapper(bo);
+        Page<TblTaxiOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询打车订单列表
+     */
+    @Override
+    public List<TblTaxiOrderVo> queryList(TblTaxiOrderBo bo) {
+        LambdaQueryWrapper<TblTaxiOrder> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<TblTaxiOrder> buildQueryWrapper(TblTaxiOrderBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<TblTaxiOrder> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getOrderId()), TblTaxiOrder::getOrderId, bo.getOrderId());
+        lqw.eq(bo.getFromUserId() != null, TblTaxiOrder::getFromUserId, bo.getFromUserId());
+        lqw.eq(bo.getToUserId() != null, TblTaxiOrder::getToUserId, bo.getToUserId());
+        lqw.eq(bo.getStatus() != null, TblTaxiOrder::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getFromAddr()), TblTaxiOrder::getFromAddr, bo.getFromAddr());
+        lqw.eq(bo.getGotime() != null, TblTaxiOrder::getGotime, bo.getGotime());
+        lqw.eq(bo.getPeoNum() != null, TblTaxiOrder::getPeoNum, bo.getPeoNum());
+        lqw.eq(StringUtils.isNotBlank(bo.getToAddr()), TblTaxiOrder::getToAddr, bo.getToAddr());
+        lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblTaxiOrder::getExt1, bo.getExt1());
+        lqw.eq(StringUtils.isNotBlank(bo.getExt2()), TblTaxiOrder::getExt2, bo.getExt2());
+        return lqw;
+    }
+
+    /**
+     * 新增打车订单
+     */
+    @Override
+    public Boolean insertByBo(TblTaxiOrderBo bo) {
+        TblTaxiOrder add = MapstructUtils.convert(bo, TblTaxiOrder.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改打车订单
+     */
+    @Override
+    public Boolean updateByBo(TblTaxiOrderBo bo) {
+        TblTaxiOrder update = MapstructUtils.convert(bo, TblTaxiOrder.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(TblTaxiOrder entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除打车订单
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-khy/src/main/resources/mapper/system/TblGoodsOrderMapper.xml

@@ -0,0 +1,7 @@
+<?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.system.mapper.TblGoodsOrderMapper">
+
+</mapper>

ruoyi-modules/ruoyi-khy/src/main/resources/mapper/system/TblTaxiOrderMapper.xml

@@ -0,0 +1,7 @@
+<?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.system.mapper.TblTaxiOrderMapper">
+
+</mapper>