+ * 订单明细表 前端控制器 + *
+ * + * @author cli + * @since 2025-07-10 + */ +@RestController +@RequestMapping("/fmsOdOrderDetail") +public class OrderDetailController { + +} + diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/controller/OrderMainController.java b/aircraft-system/src/main/java/com/aircraft/modules/order/controller/OrderMainController.java new file mode 100644 index 0000000..0deb31e --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/controller/OrderMainController.java @@ -0,0 +1,21 @@ +package com.aircraft.modules.order.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *+ * 订单主表 前端控制器 + *
+ * + * @author cli + * @since 2025-07-10 + */ +@RestController +@RequestMapping("/fmsOdOrderMain") +public class OrderMainController { + +} + diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/controller/OrderOperatorController.java b/aircraft-system/src/main/java/com/aircraft/modules/order/controller/OrderOperatorController.java new file mode 100644 index 0000000..3e3693a --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/controller/OrderOperatorController.java @@ -0,0 +1,21 @@ +package com.aircraft.modules.order.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *+ * 订单主单操作人关系表 前端控制器 + *
+ * + * @author cli + * @since 2025-07-10 + */ +@RestController +@RequestMapping("/fmsOdOrderOperator") +public class OrderOperatorController { + +} + diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/controller/SettlementDetailController.java b/aircraft-system/src/main/java/com/aircraft/modules/order/controller/SettlementDetailController.java new file mode 100644 index 0000000..9bdae6c --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/controller/SettlementDetailController.java @@ -0,0 +1,21 @@ +package com.aircraft.modules.order.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *+ * 订单结算详情主表 前端控制器 + *
+ * + * @author cli + * @since 2025-07-10 + */ +@RestController +@RequestMapping("/fmsOdSettlementDetail") +public class SettlementDetailController { + +} + diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/controller/SettlementMainController.java b/aircraft-system/src/main/java/com/aircraft/modules/order/controller/SettlementMainController.java new file mode 100644 index 0000000..d217bec --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/controller/SettlementMainController.java @@ -0,0 +1,21 @@ +package com.aircraft.modules.order.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *+ * 订单结算主表 前端控制器 + *
+ * + * @author cli + * @since 2025-07-10 + */ +@RestController +@RequestMapping("/fmsOdSettlementMain") +public class SettlementMainController { + +} + diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderDetail.java b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderDetail.java new file mode 100644 index 0000000..2d9bd77 --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderDetail.java @@ -0,0 +1,57 @@ +package com.aircraft.modules.order.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.aircraft.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *+ * 订单明细表 + *
+ * + * @author cli + * @since 2025-07-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fms_od_order_detail") +public class OrderDetail extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 订单ID，关联订单表 + */ + private Long orderId; + + /** + * 飞行设备ID + */ + private Long deviceId; + + /** + * 载人数量 + */ + private String personConut; + + /** + * 操作员ID + */ + private Long operatorId; + + /** + * 订单子单状态 + */ + private Boolean orderItemStatus; + + +} diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderMain.java b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderMain.java new file mode 100644 index 0000000..77ff06d --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderMain.java @@ -0,0 +1,104 @@ +package com.aircraft.modules.order.domain; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.aircraft.base.BaseEntity; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *+ * 订单主表 + *
+ * + * @author cli + * @since 2025-07-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fms_od_order_main") +public class OrderMain extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * ID主键 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 订单编号 + */ + private String orderNo; + + /** + * 订单类型 + */ + private Boolean orderType; + + /** + * 订单发起人ID + */ + private Long orderInitiatorId; + + /** + * 客户电话 + */ + private String phone; + + /** + * 景区ID + */ + private Long attractionId; + + /** + * 客户名称 + */ + private String customerName; + + /** + * 路线ID + */ + private Long routeId; + + /** + * 订单金额 + */ + private BigDecimal amount; + + /** + * 额外费用 + */ + private BigDecimal surchargeAmount; + + /** + * 微信用户唯一标识 + */ + private String openId; + + /** + * 结算状态 + */ + private Boolean settlementStatus; + + /** + * 订单主单状态 + */ + private Boolean mainOrderStatus; + + /** + * 下单时间 + */ + private Date orderCreateTime; + + /** + * 订单完成时间 + */ + private Date orderFinishTime; + + +} diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderOperator.java b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderOperator.java new file mode 100644 index 0000000..b68a431 --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderOperator.java @@ -0,0 +1,39 @@ +package com.aircraft.modules.order.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.aircraft.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *+ * 订单主单操作人关系表 + *
+ * + * @author cli + * @since 2025-07-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fms_od_order_operator") +public class OrderOperator extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 订单ID_关联订单表 + */ + private Long orderId; + + /** + * 操作人ID + */ + private Long operatorId; + + +} diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/SettlementDetail.java b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/SettlementDetail.java new file mode 100644 index 0000000..3d0f730 --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/SettlementDetail.java @@ -0,0 +1,109 @@ +package com.aircraft.modules.order.domain; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.aircraft.base.BaseEntity; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *+ * 订单结算详情主表 + *
+ * + * @author cli + * @since 2025-07-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fms_od_settlement_detail") +public class SettlementDetail extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * ID主键 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 结算订单ID + */ + private Long settlementMainId; + + /** + * 订单编号 + */ + private String orderNo; + + /** + * 订单类型 + */ + private Boolean orderType; + + /** + * 订单发起人ID + */ + private Long orderInitiatorId; + + /** + * 客户电话 + */ + private String phone; + + /** + * 景区ID + */ + private Long attractionId; + + /** + * 客户名称 + */ + private String customerName; + + /** + * 路线ID + */ + private Long routeId; + + /** + * 订单金额 + */ + private BigDecimal amount; + + /** + * 额外费用 + */ + private BigDecimal surchargeAmount; + + /** + * 微信用户唯一标识 + */ + private String openId; + + /** + * 结算状态 + */ + private Boolean settlementStatus; + + /** + * 订单主单状态 + */ + private Boolean mainOrderStatus; + + /** + * 下单时间 + */ + private Date orderCreateTime; + + /** + * 订单完成时间 + */ + private Date orderFinishTime; + + +} diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/SettlementMain.java b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/SettlementMain.java new file mode 100644 index 0000000..08b256f --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/SettlementMain.java @@ -0,0 +1,53 @@ +package com.aircraft.modules.order.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.aircraft.base.BaseEntity; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *+ * 订单结算主表 + *
+ * + * @author cli + * @since 2025-07-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fms_od_settlement_main") +public class SettlementMain extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 结算批次号 + */ + private Integer batchNo; + + /** + * 结算状态 + */ + private String settlementStatus; + + /** + * 结算日期 + */ + private Date settlementTime; + + /** + * 结算操作人 + */ + private Long operatorId; + + +} diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/AttachmentMaterialMapper.java b/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/AttachmentMaterialMapper.java new file mode 100644 index 0000000..75aeeb5 --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/AttachmentMaterialMapper.java @@ -0,0 +1,16 @@ +package com.aircraft.modules.order.mapper; + +import com.aircraft.modules.system.domain.AttachmentMaterial; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author cli + * @since 2025-07-10 + */ +public interface AttachmentMaterialMapper extends BaseMapper+ * 订单明细表 Mapper 接口 + *
+ * + * @author cli + * @since 2025-07-10 + */ +public interface OrderDetailMapper extends BaseMapper+ * 订单主表 Mapper 接口 + *
+ * + * @author cli + * @since 2025-07-10 + */ +public interface OrderMainMapper extends BaseMapper+ * 订单主单操作人关系表 Mapper 接口 + *
+ * + * @author cli + * @since 2025-07-10 + */ +public interface OrderOperatorMapper extends BaseMapper+ * 订单结算详情主表 Mapper 接口 + *
+ * + * @author cli + * @since 2025-07-10 + */ +public interface SettlementDetailMapper extends BaseMapper+ * 订单明细表 服务类 + *
+ * + * @author cli + * @since 2025-07-10 + */ +public interface OrderDetailService extends IService+ * 订单主表 服务类 + *
+ * + * @author cli + * @since 2025-07-10 + */ +public interface OrderMainService extends IService+ * 订单主单操作人关系表 服务类 + *
+ * + * @author cli + * @since 2025-07-10 + */ +public interface OrderOperatorService extends IService+ * 订单结算详情主表 服务类 + *
+ * + * @author cli + * @since 2025-07-10 + */ +public interface SettlementDetailService extends IService+ * 订单结算主表 服务类 + *
+ * + * @author cli + * @since 2025-07-10 + */ +public interface SettlementMainService extends IService+ * 订单明细表 服务实现类 + *
+ * + * @author cli + * @since 2025-07-10 + */ +@Service +public class OrderDetailServiceImpl extends ServiceImpl+ * 订单主表 服务实现类 + *
+ * + * @author cli + * @since 2025-07-10 + */ +@Service +public class OrderMainServiceImpl extends ServiceImpl+ * 订单主单操作人关系表 服务实现类 + *
+ * + * @author cli + * @since 2025-07-10 + */ +@Service +public class OrderOperatorServiceImpl extends ServiceImpl+ * 订单结算详情主表 服务实现类 + *
+ * + * @author cli + * @since 2025-07-10 + */ +@Service +public class SettlementDetailServiceImpl extends ServiceImpl+ * 订单结算主表 服务实现类 + *
+ * + * @author cli + * @since 2025-07-10 + */ +@Service +public class SettlementMainServiceImpl extends ServiceImpl+ * + *
+ * + * @author cli + * @since 2025-07-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fms_attachment_material") +public class AttachmentMaterial extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 业务ID（如订单、合同） + */ + private Long businessId; + + /** + * 业务类型（如order、invoice ） + */ + private String businessType; + + /** + * 文件类型（jpg,png） + */ + private String fileType; + + /** + * 文件code + */ + private Boolean fileCode; + + /** + * 源文件名称 + */ + private String sourceFileName; + + /** + * 新文件名称 + */ + private String newFileName; + + /** + * 桶名 + */ + private String bucketName; + + /** + * 文件大小（字节） + */ + private Long fileSize; + + /** + * 文件的相对路径（桶内路径，不包括桶名） + */ + private String filePath; + + /** + * 文件的全路径（包含桶名和域名，生成完整 URL） + */ + private String fileFullPath; + + +} diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/mapper/SettlementMainMapper.java b/aircraft-system/src/main/java/com/aircraft/modules/system/mapper/SettlementMainMapper.java new file mode 100644 index 0000000..62e9244 --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/mapper/SettlementMainMapper.java @@ -0,0 +1,16 @@ +package com.aircraft.modules.system.mapper; + +import com.aircraft.modules.order.domain.SettlementMain; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * 订单结算主表 Mapper 接口 + *
+ * + * @author cli + * @since 2025-07-10 + */ +public interface SettlementMainMapper extends BaseMapper+ * 前端控制器 + *
+ * + * @author cli + * @since 2025-07-10 + */ +@RestController +@RequestMapping("/fmsAttachmentMaterial") +public class AttachmentMaterialController { + +} + diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/service/AttachmentMaterialService.java b/aircraft-system/src/main/java/com/aircraft/modules/system/service/AttachmentMaterialService.java new file mode 100644 index 0000000..b662022 --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/service/AttachmentMaterialService.java @@ -0,0 +1,16 @@ +package com.aircraft.modules.system.service; + +import com.aircraft.modules.system.domain.AttachmentMaterial; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *+ * 服务类 + *
+ * + * @author cli + * @since 2025-07-10 + */ +public interface AttachmentMaterialService extends IService+ * 服务实现类 + *
+ * + * @author cli + * @since 2025-07-10 + */ +@Service +public class AttachmentMaterialServiceImpl extends ServiceImpl