From b70eec17ac045cdc2de640092c96037f1e7b0d2e Mon Sep 17 00:00:00 2001
From: shinnosuke <tantao@1hoper.com>
Date: 星期二, 23 六月 2026 16:06:37 +0800
Subject: [PATCH] 新增了部分v2.0 p1功能
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/OrderInvoiceExport.java | 57 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/OrderInvoiceExport.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/OrderInvoiceExport.java
index 9434e69..ff8bbfd 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/OrderInvoiceExport.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/OrderInvoiceExport.java
@@ -11,69 +11,78 @@
@ApiModel(value = "导出发票")
public class OrderInvoiceExport implements Serializable {
- @Excel(name = "申请单编号",width = 30)
+ @Excel(name = "申请单编号", width = 30)
private String code;
- @Excel(name = "申请日期",width = 30)
+ @Excel(name = "申请日期", width = 30)
+ private String applyTime;
+
+ @Excel(name = "开票日期", width = 30)
private String billingTime;
- @Excel(name = "开票公司",width = 30)
+ @Excel(name = "归属电站", width = 30)
+ private String siteName;
+
+ @Excel(name = "归属合作商", width = 30)
+ private String partnerName;
+
+ @Excel(name = "开票公司", width = 30)
private String invoicingCompany;
- @Excel(name = "发票类型",width = 30)
+ @Excel(name = "发票类型", width = 30)
private String invoiceType;
- @Excel(name = "发票种类",replace = {"纸质发票_1","电子发票_2"},width = 30)
+ @Excel(name = "发票种类", replace = {"纸质发票_1", "电子发票_2"}, width = 30)
private Integer invoiceMaterial;
- @Excel(name = "开票方式",replace = {"人工_1","自动_2"},width = 30)
+ @Excel(name = "开票方式", replace = {"人工_1", "自动_2"}, width = 30)
private Integer invoicingMethod;
- @Excel(name = "开票总金额",width = 30)
+ @Excel(name = "开票总金额", width = 30)
private BigDecimal totalAmount;
- @Excel(name = "服务费",width = 30)
+ @Excel(name = "服务费", width = 30)
private BigDecimal serviceCharge;
- @Excel(name = "服务费税率",width = 30)
+ @Excel(name = "服务费税率", width = 30)
private BigDecimal serviceTariff;
- @Excel(name = "增值服务费",width = 30)
+ @Excel(name = "增值服务费", width = 30)
private BigDecimal addedService;
- @Excel(name = "增值服务费税率",width = 30)
+ @Excel(name = "增值服务费税率", width = 30)
private BigDecimal addedServiceTariff;
-// @Excel(name = "开票订单类型",replace = {"充电订单_1","购物订单_2","兑换订单_3","会员订单_4"},width = 30)
-// private Integer orderType;
-
- @Excel(name = "抬头类型",replace = {"个人_1","企业_2"},width = 30)
+ @Excel(name = "抬头类型", replace = {"个人_1", "企业_2"}, width = 30)
private Integer invoicingObjectType;
- @Excel(name = "发票抬头",width = 30)
+ @Excel(name = "发票抬头", width = 30)
private String name;
- @Excel(name = "开户银行",width = 30)
+ @Excel(name = "开户银行", width = 30)
private String depositBank;
- @Excel(name = "银行账户",width = 30)
+ @Excel(name = "银行账号", width = 30)
private String bankAccount;
- @Excel(name = "公司电话",width = 30)
+ @Excel(name = "公司电话", width = 30)
private String companyPhone;
- @Excel(name = "纳税识别号",width = 30)
+ @Excel(name = "纳税识别号", width = 30)
private String taxIdentificationNumber;
- @Excel(name = "公司地址",width = 30)
+ @Excel(name = "公司地址", width = 30)
private String companyAddress;
- @Excel(name = "邮箱",width = 30)
+ @Excel(name = "邮箱", width = 30)
private String mailbox;
- @Excel(name = "状态",replace = {"待开票_1","开票中_2","已开票_3"},width = 30)
+ @Excel(name = "备注", width = 30)
+ private String remark;
+
+ @Excel(name = "状态", replace = {"待开票_1", "开票中_2", "已开票_3", "已取消_4"}, width = 30)
private Integer status;
- @Excel(name = "用户电话",width = 30)
+ @Excel(name = "用户电话", width = 30)
private String userPhone;
}
--
Gitblit v1.7.1