From d1f4be00fc8ab2faf990aa0446156b305fc25586 Mon Sep 17 00:00:00 2001
From: 李白 <7387820+wjli_13439841639@user.noreply.gitee.com>
Date: 星期五, 05 六月 2026 08:14:28 +0800
Subject: [PATCH] 新增开票记录和开票项记录
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/SaleCredit.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/SaleCredit.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/SaleCredit.java
index 48ba3de..7d7d4e7 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/SaleCredit.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/SaleCredit.java
@@ -1,8 +1,10 @@
package com.by4cloud.platformx.business.entity;
+
import com.baomidou.mybatisplus.annotation.TableField;
import com.by4cloud.platformx.business.vo.ContractOutBoundVo;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -10,8 +12,10 @@
import jakarta.persistence.Transient;
import lombok.Data;
import org.hibernate.annotations.Comment;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
/**
@@ -22,7 +26,7 @@
@Data
@Entity
@Table(name = "sale_credit")
-@Comment("閿�鍞寕璐�")
+@Comment("缁撶畻璁板綍")
public class SaleCredit extends BaseModel<SaleCredit> {
@Schema(description = "閿�鍞紪鍙�")
@@ -89,13 +93,17 @@
@Column(name = "contact_phone_b",columnDefinition = "VARCHAR(50) comment '涔欐柟鑱旂郴鐢佃瘽'")
private String contactPhoneB;
- @Schema(description = "鎸傝处閲戦")
- @Column(columnDefinition = "decimal(10,2) comment '鎸傝处閲戦'")
+ @Schema(description = "鎬婚噾棰�")
+ @Column(columnDefinition = "decimal(10,2) comment '鎬婚噾棰�'")
private BigDecimal totalAmount;
@Schema(description = "鎸傝处閲戦鎬荤◣棰�")
@Column(columnDefinition = "decimal(10,2) comment '鎸傝处閲戦鎬荤◣棰�'")
private BigDecimal totalTax;
+
+ @Schema(description = "鎸傝处閲戦鍚堣")
+ @Column(columnDefinition = "decimal(10,2) comment '鎸傝处閲戦鍚堣'")
+ private BigDecimal amountAndtax;
@Schema(description = "鏍囩殑鐗╄鎯�")
@Column(columnDefinition = "TEXT comment '鏍囩殑鐗╄鎯�'")
@@ -113,22 +121,34 @@
@Column(columnDefinition = "tinyint(2) default 0 comment '鐘舵�侊紙200锛�'")
private Integer bipStatus;
- @Schema(description = "寮�绁ㄧ粨鏋滅姸鎬� 0鏈彁浜ら粯璁� 1澶勭悊涓� 2閫氳繃 3椹冲洖 4寮�绁ㄥけ璐�")
- @javax.persistence.Column(columnDefinition="int(1) comment '鎺掑簭'")
+ @Schema(description = "寮�钃濈エ缁撴灉鐘舵�� 0鏈紑绁� 1寮�绁ㄦ垚鍔� 2寮�绁ㄥけ璐�")
+ @javax.persistence.Column(columnDefinition="int(1) default 0 comment '寮�钃濈エ缁撴灉鐘舵��'")
private Integer blueResultStatus;
- @Schema(description = "寮�绾㈢エ缁撴灉鐘舵�� 0鏈彁浜ら粯璁� 1澶勭悊涓� 2閫氳繃 3椹冲洖 4寮�绁ㄥけ璐�")
- @javax.persistence.Column(columnDefinition="int(1) comment '鎺掑簭'")
+ @Schema(description = "寮�绾㈢エ缁撴灉鐘舵�� 0鏈紑绁� 1寮�绁ㄦ垚鍔� 2寮�绁ㄥけ璐�")
+ @javax.persistence.Column(columnDefinition="int(1) comment '寮�绾㈢エ缁撴灉鐘舵��'")
private Integer redResultStatus;
@Schema(description = "钃濈エid")
@Column(columnDefinition = "bigint default null comment '钃濈エid'")
private Long blueInvoiceResultId;
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Schema(description = "钃濈エ寮�绁ㄦ椂闂�")
+ @Column(columnDefinition = "datetime comment '钃濈エ寮�绁ㄦ椂闂�'")
+ private Date blueInvoiceTime;
+
@Schema(description = "绾㈢エid")
@Column(columnDefinition = "bigint default null comment '绾㈢エid'")
private Long redInvoiceResultId;
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Schema(description = "绾㈢エ寮�绁ㄦ椂闂�")
+ @Column(columnDefinition = "datetime comment '绾㈢エ寮�绁ㄦ椂闂�'")
+ private Date redInvoiceTime;
+
@Schema(description = "寮�绁ㄨ鎯�")
@Column(columnDefinition = "TEXT comment '寮�绁ㄨ鎯�'")
private String invoiceRemark;
--
Gitblit v1.9.1