From c5c284896ce6428cffc5092e9cdef4fefc23409f Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 18 九月 2026 17:12:49 +0800
Subject: [PATCH] feat: 石煤机客商产品查询处理 合同推送新增选商方式和是否关联交易
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractInvoice.java | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractInvoice.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractInvoice.java
index 8b7d88d..a5dea23 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractInvoice.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractInvoice.java
@@ -22,7 +22,7 @@
public class ContractInvoice extends BaseModel<ContractInvoice> {
@Schema(description = "鍏宠仈鍚堝悓ID")
- @Column(columnDefinition = "bigint not null comment '鍏宠仈鍚堝悓ID'")
+ @Column(columnDefinition = "bigint comment '鍏宠仈鍚堝悓ID'")
private Long contractId;
@Schema(description = "鍙戠エ绫诲瀷")
@@ -30,7 +30,7 @@
private String invoiceCategory;
@Schema(description = "寮�绁ㄩ噾棰濓紙涓嶅惈绋庯級")
- @Column(columnDefinition="decimal(10,2) comment '寮�绁ㄩ噾棰濓紙鍚◣'")
+ @Column(columnDefinition="decimal(10,2) comment '寮�绁ㄩ噾棰濓紙涓嶅惈绋�'")
private BigDecimal invoiceTotalPrice;
@Schema(description = "寮�绁ㄧ◣棰�")
@@ -76,7 +76,7 @@
@Schema(description = "鏈烘瀯绋庡彿")
@Column(columnDefinition="varchar(64) comment '鏈烘瀯绋庡彿'")
- private String texNo;
+ private String taxNo;
@Schema(description = "閿�鍞柟鍚嶇О")
@Column(columnDefinition="varchar(128) comment '閿�鍞柟鍚嶇О'")
@@ -85,6 +85,10 @@
@Schema(description = "璐拱鏂瑰悕绉�")
@Column(columnDefinition="varchar(128) comment '璐拱鏂瑰悕绉�'")
private String buyerTaxName;
+
+ @Schema(description = "璐拱鏂圭◣鍙�")
+ @Column(columnDefinition="varchar(128) comment '璐拱鏂瑰悕绉�'")
+ private String buyerTaxNo;
@Schema(description = "鍙戠エ棰勮淇℃伅")
@Column(columnDefinition="text comment '鍙戠エ棰勮淇℃伅'")
@@ -103,10 +107,43 @@
private String bipPush;
@Schema(description = "bip鎺ㄩ�佹垚鍔熷悗杩斿洖鏁版嵁ID")
- @Column(columnDefinition="bigint comment 'bip鎺ㄩ�佹爣璇� 1/宸叉帹閫� 0/鏈帹閫�'")
+ @Column(columnDefinition="bigint comment 'bip鎺ㄩ�佹垚鍔熷悗杩斿洖鏁版嵁ID'")
private Long bipId;
@Schema(description = "鍙戠エ棰勮bip鎺ㄩ�佹垚鍔熷悗杩斿洖鐨勬暟鎹粨鏋�")
- @Column(columnDefinition="text comment '鍙戠エ棰勮淇℃伅'")
+ @Column(columnDefinition="text comment '鍙戠エ棰勮bip鎺ㄩ�佹垚鍔熷悗杩斿洖鐨勬暟鎹粨鏋�'")
private String bipBody;
+
+ @Schema(description = "bip鎺ㄩ�佹垚鍔熷悗杩斿洖鏁版嵁ID")
+ @Column(columnDefinition="varchar(64) comment 'bip鎺ㄩ�佹垚鍔熷悗杩斿洖鏁版嵁ID'")
+ private String bipFileId;
+
+ @Schema(description = "鍏宠仈璇锋眰ID")
+ @Column(columnDefinition = "varchar(64) comment '鍏宠仈璇锋眰ID'")
+ private String bwRequestId;
+
+ @Schema(description = "鍏宠仈璇锋眰鍙傛暟")
+ @Column(columnDefinition = "text comment '鍏宠仈璇锋眰鍙傛暟'")
+ private String bwRequestParam;
+
+ @Schema(description = "璇锋眰缁撴灉")
+ @Column(columnDefinition = "char comment '璇锋眰缁撴灉 0/澶辫触 1/鎴愬姛'")
+ private String bwRequestResult;
+
+ @Schema(description = "棰勬敹寮�绁ㄦ爣璇�")
+ @Column(columnDefinition = "char default '0' comment '0/鍚� 1/鏄�'")
+ private String advanceFlag;
+
+ @Schema(description = "鍙戠エ鏉ユ簮")
+ @Column(columnDefinition="char default '0' comment '鍙戠エ鏉ユ簮 0/绯荤粺鐢熸垚 1/澶栭儴鑾峰彇'")
+ private String invoiceSource;
+
+ @Schema(description = "鏄惁鍚堝苟寮�绁�")
+ @Column(name = "isMerge",columnDefinition="tinyint(1) default 0 comment '鏄惁鍚堝苟寮�绁� 0/鍚� 1/鏄�'")
+ private Boolean isMerge;
+
+ @Schema(description = "鍚堝苟寮�绁ㄥ悎鍚宨d")
+ @Column(columnDefinition="text comment '鍚堝苟寮�绁ㄥ悎鍚宨d'")
+ private String contractIds;
+
}
--
Gitblit v1.9.1