feat:订单模块代码生成

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardInvoiceDto.java

@@ -3,6 +3,11 @@ package com.bsd.pjcloud.hard.api.dto;
 import com.bsd.pjcloud.hard.api.entity.HardInvoiceEntity;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class HardInvoiceDto extends HardInvoiceEntity {
+    private List<Long> deptIds;
+
+    private List<Long> merchantIds;
 }

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardManagerDto.java

@@ -3,6 +3,13 @@ package com.bsd.pjcloud.hard.api.dto;
 import com.bsd.pjcloud.hard.api.entity.HardManagerEntity;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class HardManagerDto extends HardManagerEntity {
+
+    private List<Long> deptIds;
+
+    private List<Long> merchantIds;
+
 }

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java

@@ -0,0 +1,8 @@
+package com.bsd.pjcloud.hard.api.dto.order;
+
+import com.bsd.pjcloud.hard.api.entity.order.HardCarEntity;
+import lombok.Data;
+
+@Data
+public class HardCarDto extends HardCarEntity {
+}

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardParentCarDto.java

@@ -0,0 +1,8 @@
+package com.bsd.pjcloud.hard.api.dto.order;
+
+import com.bsd.pjcloud.hard.api.entity.order.HardParentCarEntity;
+import lombok.Data;
+
+@Data
+public class HardParentCarDto extends HardParentCarEntity {
+}

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardwareOrderDto.java

@@ -0,0 +1,8 @@
+package com.bsd.pjcloud.hard.api.dto.order;
+
+import com.bsd.pjcloud.hard.api.entity.order.HardwareOrderEntity;
+import lombok.Data;
+
+@Data
+public class HardwareOrderDto extends HardwareOrderEntity {
+}

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/order/HardCarEntity.java

@@ -0,0 +1,122 @@
+package com.bsd.pjcloud.hard.api.entity.order;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.bsd.pjcloud.common.core.util.TenantTable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 购物车表
+ *
+ * @author dzc
+ * @date 2025-01-05 16:44:54
+ */
+@Data
+@TenantTable
+@TableName("hard_car")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "购物车表")
+public class HardCarEntity extends Model<HardCarEntity> {
+
+
+	/**
+	* 编号
+	*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description="编号")
+    private Long id;
+
+	/**
+	* 父购物车id
+	*/
+    @Schema(description="父购物车id")
+    private Long parentCarId;
+
+	/**
+	* 商品id
+	*/
+    @Schema(description="商品id")
+    private Long productId;
+
+	/**
+	* 商品名
+	*/
+    @Schema(description="商品名")
+    private String productName;
+
+	/**
+	* 商品图片
+	*/
+    @Schema(description="商品图片")
+    private String productPic;
+
+	/**
+	* 商品价格
+	*/
+    @Schema(description="商品价格")
+    private Long productPrice;
+
+	/**
+	* 数量
+	*/
+    @Schema(description="数量")
+    private Integer productCount;
+
+	/**
+	* 重量
+	*/
+    @Schema(description="重量")
+    private BigDecimal productWeight;
+
+	/**
+	* 总价(分)
+	*/
+    @Schema(description="总价(分)")
+    private Long totalPrice;
+
+	/**
+	* 创建人
+	*/
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建人")
+    private String createBy;
+
+	/**
+	* 创建时间
+	*/
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建时间")
+    private LocalDateTime createTime;
+
+	/**
+	* 修改人
+	*/
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description="修改人")
+    private String updateBy;
+
+	/**
+	* 修改时间
+	*/
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description="修改时间")
+    private LocalDateTime updateTime;
+
+	/**
+	* 删除标记
+	*/
+    @TableLogic
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="删除标记")
+    private String delFlag;
+
+	/**
+	* 租户ID
+	*/
+    @Schema(description="租户ID")
+    private Long tenantId;
+}

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/order/HardParentCarEntity.java

@@ -0,0 +1,91 @@
+package com.bsd.pjcloud.hard.api.entity.order;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.bsd.pjcloud.common.core.util.TenantTable;
+import java.time.LocalDateTime;
+
+/**
+ * 父订单表
+ *
+ * @author dzc
+ * @date 2025-01-05 16:45:33
+ */
+@Data
+@TenantTable
+@TableName("hard_parent_car")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "父订单表")
+public class HardParentCarEntity extends Model<HardParentCarEntity> {
+
+
+	/**
+	* 标号
+	*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description="标号")
+    private Long id;
+
+	/**
+	* 用户id
+	*/
+    @Schema(description="用户id")
+    private Long userId;
+
+	/**
+	* 商户id
+	*/
+    @Schema(description="商户id")
+    private Long merchantId;
+
+	/**
+	* 订单状态
+	*/
+    @Schema(description="订单状态")
+    private String orderStatus;
+
+	/**
+	* 创建人
+	*/
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建人")
+    private String createBy;
+
+	/**
+	* 创建时间
+	*/
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建时间")
+    private LocalDateTime createTime;
+
+	/**
+	* 修改人
+	*/
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description="修改人")
+    private String updateBy;
+
+	/**
+	* 修改时间
+	*/
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description="修改时间")
+    private LocalDateTime updateTime;
+
+	/**
+	* 删除标记
+	*/
+    @TableLogic
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="删除标记")
+    private String delFlag;
+
+	/**
+	* 租户ID
+	*/
+    @Schema(description="租户ID")
+    private Long tenantId;
+}

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/order/HardwareOrderEntity.java

@@ -0,0 +1,223 @@
+package com.bsd.pjcloud.hard.api.entity.order;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.bsd.pjcloud.common.core.util.TenantTable;
+import java.time.LocalDateTime;
+
+/**
+ * 订单表
+ *
+ * @author dzc
+ * @date 2025-01-05 16:46:25
+ */
+@Data
+@TenantTable
+@TableName("hardware_order")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "订单表")
+public class HardwareOrderEntity extends Model<HardwareOrderEntity> {
+
+
+	/**
+	* 编号
+	*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description="编号")
+    private Long id;
+
+	/**
+	* 用户id
+	*/
+    @Schema(description="用户id")
+    private Long userId;
+
+	/**
+	* 商户id
+	*/
+    @Schema(description="商户id")
+    private Long merchantId;
+
+	/**
+	* 设备id
+	*/
+    @Schema(description="设备id")
+    private Long hardId;
+
+	/**
+	* 部门id
+	*/
+    @Schema(description="部门id")
+    private Long deptId;
+
+	/**
+	* 钱包id
+	*/
+    @Schema(description="钱包id")
+    private Long walletId;
+
+	/**
+	* 购物车父id
+	*/
+    @Schema(description="购物车父id")
+    private Long parentCarId;
+
+	/**
+	* 订单类型渠道id
+	*/
+    @Schema(description="订单类型渠道id")
+    private Long orderSourceTypeId;
+
+	/**
+	* 订单类型
+	*/
+    @Schema(description="订单类型")
+    private String orderType;
+
+	/**
+	* 订单状态
+	*/
+    @Schema(description="订单状态")
+    private String orderStatus;
+
+	/**
+	* 支付方式
+	*/
+    @Schema(description="支付方式")
+    private String payType;
+
+	/**
+	* 用餐类型
+	*/
+    @Schema(description="用餐类型")
+    private String hourType;
+
+	/**
+	* 订单设备类型
+	*/
+    @Schema(description="订单设备类型")
+    private String sysType;
+
+	/**
+	* 总价(分)
+	*/
+    @Schema(description="总价(分)")
+    private Integer totalPrice;
+
+	/**
+	* 额外价格(分)
+	*/
+    @Schema(description="额外价格(分)")
+    private Integer extraPrice;
+
+	/**
+	* 支付金额(分)
+	*/
+    @Schema(description="支付金额(分)")
+    private Integer payPrice;
+
+	/**
+	* 支付时间
+	*/
+    @Schema(description="支付时间")
+    private LocalDateTime payTime;
+
+	/**
+	* 支付退款单号
+	*/
+    @Schema(description="支付退款单号")
+    private Long payRefundId;
+
+	/**
+	* 退款金额，单位：分
+	*/
+    @Schema(description="退款金额，单位：分")
+    private Integer refundPrice;
+
+	/**
+	* 退款完成时间
+	*/
+    @Schema(description="退款完成时间")
+    private LocalDateTime refundTime;
+
+	/**
+	* 退款状态
+	*/
+    @Schema(description="退款状态")
+    private String refundStatus;
+
+	/**
+	* 订单取消时间
+	*/
+    @Schema(description="订单取消时间")
+    private LocalDateTime applyCancelTime;
+
+	/**
+	* 设备上的唯一订单号
+	*/
+    @Schema(description="设备上的唯一订单号")
+    private String androidOrderCode;
+
+	/**
+	* 是否为离线订单
+	*/
+    @Schema(description="是否为离线订单")
+    private String isOfflineOrder;
+
+	/**
+	* 商品描述
+	*/
+    @Schema(description="商品描述")
+    private String productDesc;
+
+	/**
+	* 离线自动支付是否成功
+	*/
+    @Schema(description="离线自动支付是否成功")
+    private String offlinePaySuccess;
+
+	/**
+	* 创建人
+	*/
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建人")
+    private String createBy;
+
+	/**
+	* 创建时间
+	*/
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建时间")
+    private LocalDateTime createTime;
+
+	/**
+	* 修改人
+	*/
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description="修改人")
+    private String updateBy;
+
+	/**
+	* 修改时间
+	*/
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description="修改时间")
+    private LocalDateTime updateTime;
+
+	/**
+	* 删除标记
+	*/
+    @TableLogic
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="删除标记")
+    private String delFlag;
+
+	/**
+	* 租户ID
+	*/
+    @Schema(description="租户ID")
+    private Long tenantId;
+}

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardInvoiceVo.java

@@ -1,8 +1,14 @@
 package com.bsd.pjcloud.hard.api.vo;
 
+import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface;
 import com.bsd.pjcloud.hard.api.entity.HardInvoiceEntity;
+import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface;
 import lombok.Data;
 
 @Data
-public class HardInvoiceVo extends HardInvoiceEntity {
+public class HardInvoiceVo extends HardInvoiceEntity implements BaseDeptInterface, BaseMchInterface {
+    private String deptName;
+
+    private Long merchantId;
+    private String merchantName;
 }

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardCarVo.java

@@ -0,0 +1,8 @@
+package com.bsd.pjcloud.hard.api.vo.order;
+
+import com.bsd.pjcloud.hard.api.entity.order.HardCarEntity;
+import lombok.Data;
+
+@Data
+public class HardCarVo extends HardCarEntity {
+}

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardParentCarVo.java

@@ -0,0 +1,8 @@
+package com.bsd.pjcloud.hard.api.vo.order;
+
+import com.bsd.pjcloud.hard.api.entity.order.HardParentCarEntity;
+import lombok.Data;
+
+@Data
+public class HardParentCarVo extends HardParentCarEntity {
+}

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardwareOrderVo.java

@@ -0,0 +1,8 @@
+package com.bsd.pjcloud.hard.api.vo.order;
+
+import com.bsd.pjcloud.hard.api.entity.order.HardwareOrderEntity;
+import lombok.Data;
+
+@Data
+public class HardwareOrderVo extends HardwareOrderEntity {
+}