From 208338dd6da00b8e6b07bcb5e01af97edea787b4 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Sat, 15 Apr 2023 17:01:27 +0800
Subject: [PATCH] =?UTF-8?q?update=E7=94=B3=E8=AF=B7=E5=BC=80=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/service/OrderService.java     |  7 +++-
 .../common/enums/InvoiceRecordEnum.java       | 39 +++++++++++++++++++
 .../pile/vo/uniapp/InvoiceRecordVO.java       | 17 ++++++++
 3 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 jsowell-common/src/main/java/com/jsowell/common/enums/InvoiceRecordEnum.java

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
index 4d962f94b..038881e7c 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -12,6 +12,7 @@ import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
 import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
 import com.jsowell.common.core.page.PageResponse;
 import com.jsowell.common.core.redis.RedisCache;
+import com.jsowell.common.enums.InvoiceRecordEnum;
 import com.jsowell.common.enums.MemberWalletEnum;
 import com.jsowell.common.enums.ykc.ActionTypeEnum;
 import com.jsowell.common.enums.ykc.OrderPayModeEnum;
@@ -1090,7 +1091,11 @@ public class OrderService {
 		for (OrderInvoiceRecord orderInvoiceRecord : orderInvoiceRecords) {
 			volist.add(
 					InvoiceRecordVO.builder()
-
+							.status(InvoiceRecordEnum.getLabel(orderInvoiceRecord.getStatus()))
+							.totalAmount(orderInvoiceRecord.getTotalAmount())
+							.totalElecAmount(orderInvoiceRecord.getTotalElecAmount())
+							.totalServiceAmount(orderInvoiceRecord.getTotalServiceAmount())
+							.createTime(DateUtils.formatDateTime(orderInvoiceRecord.getCreateTime()))
 							.build()
 			);
 		}
diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/InvoiceRecordEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/InvoiceRecordEnum.java
new file mode 100644
index 000000000..5e4b2a44e
--- /dev/null
+++ b/jsowell-common/src/main/java/com/jsowell/common/enums/InvoiceRecordEnum.java
@@ -0,0 +1,39 @@
+package com.jsowell.common.enums;
+
+public enum InvoiceRecordEnum {
+	NOT_INVOICED("0", "未开票"),
+	INVOICED("1", "已开票"),
+	;
+	private String value;
+	private String label;
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public String getLabel() {
+		return label;
+	}
+
+	public void setLabel(String label) {
+		this.label = label;
+	}
+
+	InvoiceRecordEnum(String value, String label) {
+		this.value = value;
+		this.label = label;
+	}
+
+	public static String getLabel(String value) {
+		for (InvoiceRecordEnum titleTypeEnum : InvoiceRecordEnum.values()) {
+			if (titleTypeEnum.getValue().equals(value)) {
+				return titleTypeEnum.getLabel();
+			}
+		}
+		return "";
+	}
+}
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceRecordVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceRecordVO.java
index f9a5a7244..244735eaa 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceRecordVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceRecordVO.java
@@ -5,9 +5,26 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
+
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
 public class InvoiceRecordVO {
+	private String status;
+
+	private BigDecimal totalAmount;
+
+	/**
+	 * 总服务费金额
+	 */
+	private BigDecimal totalServiceAmount;
+
+	/**
+	 * 总电费金额
+	 */
+	private BigDecimal totalElecAmount;
+
+	private String createTime;
 }