From ce56e6447c3a47a9d9408eb5205dd563aabe1a39 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 05 一月 2025 18:38:50 +0800
Subject: [PATCH] 修改计费bug
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderInvoice.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderInvoice.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderInvoice.java
index f7f675c..133959d 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderInvoice.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderInvoice.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,6 +12,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
/**
* <p>
@@ -47,10 +49,14 @@
@ApiModelProperty(value = "开票公司")
@TableField("invoicing_company")
private String invoicingCompany;
+
+ @ApiModelProperty(value = "发票类型id")
+ @TableField("invoice_type_id")
+ private Integer invoiceTypeId;
- @ApiModelProperty(value = "发票类型（1=增值税普通发票，2=增值税专用发票）")
+ @ApiModelProperty(value = "发票类型")
@TableField("invoice_type")
- private Integer invoiceType;
+ private String invoiceType;
@ApiModelProperty(value = "发票材质（1=纸质发票，2=电子发票）")
@TableField("invoice_material")
@@ -103,6 +109,19 @@
@ApiModelProperty(value = "状态（1=待开票，2=开票中，3=已开票）")
@TableField("status")
private Integer status;
-
+
+ @ApiModelProperty(value = "添加时间")
+ @TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "开票时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("billing_time")
+ private LocalDateTime billingTime;
+
+ @ApiModelProperty(value = "开票人id")
+ @TableField("billing_user_id")
+ private Integer billingUserId;
}
--
Gitblit v1.7.1