From d0c5483d8b01c06ba9112be72b5a5b77e1aca8c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Thu, 17 Sep 2026 22:37:07 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E8=B0=83=E6=95=B4=E9=87=91=E8=9D=B6?=
 =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E5=BA=94=E4=BB=98=E5=8D=95/=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE=E7=94=B3=E8=AF=B7=E6=8E=A8=E9=80=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- awrp_src_code 拼接付款申请号与结算明细单据号（去重）
- 分录金额直接取结算金额（含税/不含税），移除按申请付款金额分摊逻辑
- 往来类型/往来户改由合同取值：客户合同传 bd_customer，其余 bd_supplier；
  往来户取合同乙方并关联客商档案取客商编码，未维护时拦截报错
- 币种 RMB 统一映射为 CNY
- 金蝶请求 DTO 统一增加 @JsonInclude(NON_NULL)，布尔字段默认 false
- A102-2 仅传必填字段，非必传字段注释保留；isincludetax/ispricetotal 传 true
---
 .../constant/KingdeeBfiConstant.java          |  12 ++
 .../impl/PaymentApplicationServiceImpl.java   | 150 +++++++++---------
 .../bfi/pojo/dto/BfiApBillQueryDTO.java       |   2 +
 .../bfi/pojo/dto/BfiApBillSaveBodyDTO.java    |   2 +
 .../bfi/pojo/dto/BfiApBillSaveDTO.java        |   2 +
 .../bfi/pojo/dto/BfiApBillSaveEntryDTO.java   |   6 +-
 .../bfi/pojo/dto/BfiApBillSavePlanDTO.java    |   2 +
 .../pojo/dto/BfiApBillSavePreEntryDTO.java    |   2 +
 .../bfi/pojo/dto/BfiArBillQueryDTO.java       |   2 +
 .../bfi/pojo/dto/BfiArBillSaveBodyDTO.java    |   2 +
 .../bfi/pojo/dto/BfiArBillSaveDTO.java        |   2 +
 .../bfi/pojo/dto/BfiArBillSaveEntryDTO.java   |   2 +
 .../bfi/pojo/dto/BfiArBillSavePlanDTO.java    |   2 +
 .../thirdparty/bfi/pojo/dto/BfiBaseDTO.java   |   2 +
 .../pojo/dto/BfiClaimAnnounceQueryDTO.java    |   2 +
 .../bfi/pojo/dto/BfiClaimPushBodyDTO.java     |   2 +
 .../bfi/pojo/dto/BfiClaimPushDTO.java         |   2 +
 .../bfi/pojo/dto/BfiClaimPushEntryDTO.java    |   2 +
 .../bfi/pojo/dto/BfiCustomerBankEntryDTO.java |   2 +
 .../pojo/dto/BfiCustomerGroupEntryDTO.java    |   2 +
 .../pojo/dto/BfiCustomerLinkmanEntryDTO.java  |   2 +
 .../bfi/pojo/dto/BfiCustomerQueryDTO.java     |   2 +
 .../bfi/pojo/dto/BfiCustomerSaveBodyDTO.java  |   2 +
 .../bfi/pojo/dto/BfiCustomerSaveDTO.java      |   2 +
 .../bfi/pojo/dto/BfiExchangeRateQueryDTO.java |   2 +
 .../dto/BfiInvoiceApplyOpenApiBodyDTO.java    |   2 +
 .../dto/BfiInvoiceApplyOpenApiQueryDTO.java   |   2 +
 .../bfi/pojo/dto/BfiInvoiceApplyQueryDTO.java |   2 +
 .../pojo/dto/BfiInvoiceApplySaveBodyDTO.java  |   2 +
 .../bfi/pojo/dto/BfiInvoiceApplySaveDTO.java  |   2 +
 .../pojo/dto/BfiInvoiceApplySaveEntryDTO.java |   2 +
 .../bfi/pojo/dto/BfiInvoiceAssignBodyDTO.java |   2 +
 .../bfi/pojo/dto/BfiInvoiceAssignItemDTO.java |   2 +
 .../bfi/pojo/dto/BfiInvoiceAssignRefDTO.java  |   2 +
 .../bfi/pojo/dto/BfiInvoiceDownloadDTO.java   |   2 +
 .../bfi/pojo/dto/BfiInvoicePoolQueryDTO.java  |   2 +
 .../bfi/pojo/dto/BfiPayApplyPushBodyDTO.java  |   2 +
 .../bfi/pojo/dto/BfiPayApplyPushDTO.java      |   2 +
 .../bfi/pojo/dto/BfiPayApplyPushEntryDTO.java |   2 +
 .../bfi/pojo/dto/BfiPayApplyQueryDTO.java     |   2 +
 .../bfi/pojo/dto/BfiPayApplySaveBodyDTO.java  |   2 +
 .../bfi/pojo/dto/BfiPayApplySaveDTO.java      |   2 +
 .../bfi/pojo/dto/BfiPayApplySaveEntryDTO.java |   2 +
 .../bfi/pojo/dto/BfiPayBillQueryDTO.java      |   2 +
 .../bfi/pojo/dto/BfiRecBillQueryDTO.java      |   2 +
 .../pojo/dto/BfiReceivedInvoiceQueryDTO.java  |   2 +
 .../dto/BfiReceivedInvoiceSaveBodyDTO.java    |   2 +
 .../pojo/dto/BfiReceivedInvoiceSaveDTO.java   |   2 +
 .../dto/BfiReceivedInvoiceSaveEntryDTO.java   |   2 +
 .../thirdparty/bfi/pojo/dto/BfiTokenDTO.java  |   2 +
 .../bfi/pojo/dto/BfiVerifyTokenDTO.java       |   2 +
 .../bfi/pojo/dto/BfiWithdrawTokenDTO.java     |   2 +
 52 files changed, 191 insertions(+), 75 deletions(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/constant/KingdeeBfiConstant.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/constant/KingdeeBfiConstant.java
index 6de26b21..46a6751a 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/constant/KingdeeBfiConstant.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/constant/KingdeeBfiConstant.java
@@ -38,12 +38,24 @@ public final class KingdeeBfiConstant {
 	/** 往来类型：供应商（付款申请与财务应付单共用）。 */
 	public static final String BFI_SUPPLIER_ASSTACT_TYPE = "bd_supplier";
 
+	/** 往来类型：客户（财务应付单按合同类别为客户合同时使用）。 */
+	public static final String BFI_CUSTOMER_ASSTACT_TYPE = "bd_customer";
+
 	/** 来源单据类型：上游合同（有合同时传 awrp_src_bt）。 */
 	public static final String BFI_CONTRACT_SRC_BT = "awrp_contract_info";
 
 	/** 无项目时传的项目编码占位值。 */
 	public static final String BFI_PROJECT_NUMBER_NONE = "999";
 
+	/** 联调默认物料编码：金蝶测试档案值，真实货物类型档案编码与金蝶对齐后替换。 */
+	public static final String BFI_AP_BILL_MATERIAL_NUMBER_TEST = "SP0324";
+
+	/** 联调默认计量单位编码：金蝶测试档案值，档案维护计量单位编码后替换。 */
+	public static final String BFI_AP_BILL_MEASUREUNIT_NUMBER_TEST = "TON";
+
+	/** 联调默认项目编码：金蝶测试档案值，项目档案与金蝶对齐后替换。 */
+	public static final String BFI_AP_BILL_PROJECT_NUMBER_TEST = "999";
+
 	/** 付款类型编码：正式付款（结算付款）。 */
 	public static final String BFI_PAYMENT_TYPE_FORMAL = "201";
 
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
index f2398b48..9c8d7f5e 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
@@ -734,9 +734,9 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 
 		BfiPayApplySaveEntryDTO entry = new BfiPayApplySaveEntryDTO();
 		entry.setEPaymenttypeNumber("settlement_payment".equals(entity.getPaymentType()) ? KingdeeBfiConstant.BFI_PAYMENT_TYPE_FORMAL : KingdeeBfiConstant.BFI_PAYMENT_TYPE_PREPAY);
-		entry.setEAsstacttype(KingdeeBfiConstant.BFI_SUPPLIER_ASSTACT_TYPE);
-		// 供应商编码
-		entry.setEAsstactNumber(bfiSupplierCode(entity));
+		entry.setEAsstacttype(bfiAsstactType(contract));
+		// 往来户.编码：合同乙方关联客商档案客商编码
+		entry.setEAsstactNumber(bfiAsstactNumber(contract));
 		entry.setEAssacct(entity.getBankAccount());
 		entry.setEBebankNumber(entity.getBankName());
 		// 应付金额
@@ -772,7 +772,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 
 	/**
 	 * 推送金蝶财务应付单（A102-2 财务应付单保存，正式结算付款第一步），仅校验保存成功。
-	 * 明细分录按结算明细货物编码+计量单位分组推送，金额为各组分配后的申请付款金额。
+	 * 明细分录按结算明细货物编码+计量单位分组推送，金额取各组结算金额（含税/不含税）。
 	 *
 	 * @param entity      付款申请实体
 	 * @param entryGroups 结算明细聚合出的应付单分录组
@@ -797,10 +797,10 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 		param.setOrgNumber(orgNumber);
 		// 【必填】单据日期
 		param.setBizdate(billDateText);
-		// 【必填】往来类型（bd_supplier:供应商）
-		param.setAsstacttype(KingdeeBfiConstant.BFI_SUPPLIER_ASSTACT_TYPE);
-		// 【必填】往来户.编码
-		param.setAsstactNumber(bfiSupplierCode(entity));
+		// 【必填】往来类型：合同类别为“客户合同”时为 bd_customer（客户），否则 bd_supplier（供应商）
+		param.setAsstacttype(bfiAsstactType(contract));
+		// 【必填】往来户.编码：合同乙方关联客商档案客商编码
+		param.setAsstactNumber(bfiAsstactNumber(contract));
 		// 【必填】付款方式（CASH:现购, CREDIT:赊购）
 		param.setPurmode(KingdeeBfiConstant.BFI_AP_BILL_PUR_MODE_CASH);
 		// 【必填】结算币别.货币代码
@@ -813,17 +813,18 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 		param.setPaypropertyNumber(KingdeeBfiConstant.BFI_AP_BILL_PAY_PROPERTY);
 		// TODO 待确认：结算方式编码（settlementtype_number）与税率编码（taxrateid_number）需金蝶侧确认后补充，当前不传
 		// 录入含税价（非必传）
-		// param.setIsincludetax(true);
+		param.setIsincludetax(true);
 		// 录入总价，为 true 后可不录入单价（非必传）
-		// param.setIspricetotal(true);
+		param.setIspricetotal(true);
+		param.setIsintax(false);
 		// 汇率表.编码（非必传）
-		param.setExratetableNumber(bfiPayApplyExratetable);
+		// param.setExratetableNumber(bfiPayApplyExratetable);
 		// 汇率日期（非必传）
-		param.setExratedate(billDateText);
+		// param.setExratedate(billDateText);
 		// 往来单位名称（非必传）
 		// param.setAsstactname(entity.getPayeeName());
 		// 备注（非必传）
-		param.setRemark(entity.getPaymentNo() + (Func.isEmpty(entity.getSettlementNo()) ? "" : " " + entity.getSettlementNo()));
+		// param.setRemark(entity.getPaymentNo() + (Func.isEmpty(entity.getSettlementNo()) ? "" : " " + entity.getSettlementNo()));
 		// 【必填】外部系统编号（候选键）
 		param.setAwrpSrcSys(bfiPayApplySrcSys);
 		// 【必填】外部系统来源单据号（候选键）：付款申请号_结算明细单据号1_单据号2...
@@ -832,11 +833,11 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 		awrpSrcCodeParts.addAll(documentNos);
 		param.setAwrpSrcCode(String.join("_", awrpSrcCodeParts));
 		// 来源单据（非必传，有上游合同时传 awrp_contract_info）
-		param.setAwrpSrcBt(KingdeeBfiConstant.BFI_CONTRACT_SRC_BT);
+		// param.setAwrpSrcBt(KingdeeBfiConstant.BFI_CONTRACT_SRC_BT);
 		// 上游外部系统单据号/上游合同号（非必传）
-		if (Func.isNotEmpty(entity.getContractNo())) {
-			param.setAwrpSrcConNo(entity.getContractNo());
-		}
+		// if (Func.isNotEmpty(entity.getContractNo())) {
+		// 	param.setAwrpSrcConNo(entity.getContractNo());
+		// }
 		// 【必填】外部单据类型
 		param.setAwrpSrcType(KingdeeBfiConstant.BFI_AP_BILL_SRC_TYPE);
 
@@ -851,14 +852,24 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 			entry.setMeasureunitNumber(entryGroup.measureunitNumber());
 			// 【必填】数量：组内结算明细运输数量合计，无吨位数据时兜底 1
 			entry.setQuantity(entryGroup.quantity().compareTo(BigDecimal.ZERO) > 0 ? entryGroup.quantity() : BigDecimal.ONE);
-			// 应付金额（含税）（非必传）：按组内结算金额占比分配的申请付款金额
+			// 应付金额（含税）：组内结算金额（含税）合计
 			entry.setEPricetaxtotal(entryGroup.amount());
-			// 【必填】项目.项目编码
-			entry.setProjectNumber(bfiProjectNumber(entity));
+			// 金额（不含税）：组内结算金额（不含税）合计
+			entry.setEAmount(entryGroup.amountNoTax());
+			// 【必填】项目.项目编码（联调期临时传金蝶测试档案值）
+			entry.setProjectNumber(KingdeeBfiConstant.BFI_AP_BILL_PROJECT_NUMBER_TEST);
 			// 【必填】外部系统来源分录标识（候选键），A103-1 下推时以 awrp_finapbill_entryid 关联此行
 			entry.setAwrpEntryCode(entity.getPaymentNo() + "-" + (index + 1));
+
+			if (true){
+				// 【必填】物料编码.编码：结算明细货物类型匹配货物类型档案货物编码
+				entry.setMaterialNumber(KingdeeBfiConstant.BFI_AP_BILL_MATERIAL_NUMBER_TEST);
+				// 【必填】计量单位.编码：货物费用行运费计算单位（快照 price_unit，档案暂无编码字段暂传单位名称）
+				entry.setMeasureunitNumber(KingdeeBfiConstant.BFI_AP_BILL_MEASUREUNIT_NUMBER_TEST);
+			}
+
 			// 分录备注（非必传）
-			entry.setERemark(entity.getRemark());
+			// entry.setERemark(entity.getRemark());
 			detailentry.add(entry);
 		}
 		param.setDetailentry(detailentry);
@@ -866,6 +877,11 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 		// 付款计划 planentity 不传，由金蝶按明细自动汇总生成
 		// TODO 待业务确认：存在预付款抵扣时是否需传预付信息 preentry（y_billtype/y_billid/y_settleamt），本期不传、后续迭代
 
+		// 调试
+		// if (true) {
+		// 	param.setm
+		// }
+
 		BfiBillSaveResultVO saveResult = bfiService.saveApBill(param);
 		// 应付单id不落库，后续如需可经 A102-4 按防重键（awrp_src_sys + awrp_src_code）查询
 		requireBfiSaveSuccess(saveResult, "推送金蝶财务应付单");
@@ -873,7 +889,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 
 	/**
 	 * 推送金蝶付款申请（A103-1 应付下推付款申请，正式结算付款第二步），返回星瀚付款申请单id。
-	 * 付款申请分录与财务应付单明细分录一一对应，金额为各组分配后的申请付款金额。
+	 * 付款申请分录与财务应付单明细分录一一对应，申请金额取各组结算金额（含税）。
 	 *
 	 * @param entity      付款申请实体
 	 * @param entryGroups 结算明细聚合出的应付单分录组
@@ -909,7 +925,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 			entry.setEAssacct(entity.getBankAccount());
 			// TODO 待确认：往来银行为必填编码（e_bebank_number），当前暂传银行名称，待建立银行档案编码映射后调整
 			entry.setEBebankNumber(entity.getBankName());
-			// 申请金额：与对应应付单分录分配金额保持一致
+			// 申请金额：与对应应付单分录结算金额（含税）保持一致
 			entry.setEApplyamount(entryGroup.amount());
 			entry.setEExpaydate(applyDateText);
 			entry.setProjectNumber(bfiProjectNumber(entity));
@@ -929,17 +945,17 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 	 * @param materialNumber    物料编码（货物类型档案货物编码）
 	 * @param measureunitNumber 计量单位编码（运费计算单位，档案暂无编码字段暂传单位名称）
 	 * @param quantity          组内运输数量合计
-	 * @param baseAmount        组内结算金额（含税）合计，作为申请金额分配基数
-	 * @param amount            分配后的申请付款金额
+	 * @param amount            组内结算金额（含税）合计，对应明细应付金额 e_pricetaxtotal
+	 * @param amountNoTax       组内结算金额（不含税）合计，对应明细金额 e_amount
 	 */
 	private record BfiEntryGroup(String materialNumber, String measureunitNumber, BigDecimal quantity,
-								 BigDecimal baseAmount, BigDecimal amount) {
+								 BigDecimal amount, BigDecimal amountNoTax) {
 	}
 
 	/**
 	 * 应付单分录解析结果
 	 *
-	 * @param entryGroups 结算明细聚合出的应付单分录组（已分配金额）
+	 * @param entryGroups 结算明细聚合出的应付单分录组（金额取结算金额含税/不含税）
 	 * @param documentNos 结算明细单据号（去重、保持行序），用于拼接外部系统来源单据号
 	 */
 	private record BfiEntryGroupResult(List<BfiEntryGroup> entryGroups, List<String> documentNos) {
@@ -949,10 +965,10 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 	 * 解析付款申请关联的正式结算明细，按货物编码+计量单位聚合为应付单分录组。
 	 * <p>物料编码：货物费用行/结算明细货物类型（支持“、”分隔多类型）匹配货物类型档案货物编码；
 	 * 计量单位：快照运费计算单位（历史快照为空时兜底数量单位），档案暂无编码字段暂以单位名称作为编码。
-	 * 申请付款金额按各组结算金额占比分配，尾差计入最后一组分录。</p>
+	 * 分录金额直接取结算金额（含税/不含税），不按申请付款金额分摊。</p>
 	 *
 	 * @param entity 付款申请实体
-	 * @return 应付单分录解析结果（已分配金额的分录组 + 结算明细单据号）
+	 * @return 应付单分录解析结果（分录组 + 结算明细单据号）
 	 */
 	private BfiEntryGroupResult resolveBfiEntryGroups(PaymentApplication entity) {
 		List<FormalSettlementDetail> settlementDetails = formalSettlementDetails(entity);
@@ -974,51 +990,23 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 			for (FormalSettlementDetailFee detailFee : detailFees) {
 				collectEntryGroups(groupMap, cargoCodeByName, detailFee.getCargoType(),
 					resolveMeasureunitNumber(null, detailFee.getQuantityUnit()),
-					money(detailFee.getSettlementAmountTax()), money(detailFee.getTransportQuantity()),
+					money(detailFee.getSettlementAmountTax()), money(detailFee.getSettlementAmountNoTax()),
+					money(detailFee.getTransportQuantity()),
 					"货物费用[" + Func.toStr(detailFee.getCargoName()) + " 第" + Func.toStr(detailFee.getLineNo()) + "行]");
 			}
 		} else {
 			for (FormalSettlementDetail settlementDetail : settlementDetails) {
 				collectEntryGroups(groupMap, cargoCodeByName, settlementDetail.getCargoType(),
 					resolveMeasureunitNumber(null, settlementDetail.getQuantityUnit()),
-					money(settlementDetail.getSettlementAmountTax()), money(settlementDetail.getTransportQuantity()),
+					money(settlementDetail.getSettlementAmountTax()), money(settlementDetail.getSettlementAmountNoTax()),
+					money(settlementDetail.getTransportQuantity()),
 					"结算明细[" + Func.toStr(settlementDetail.getDocumentNo()) + " 第" + Func.toStr(settlementDetail.getLineNo()) + "行]");
 			}
 		}
 		if (groupMap.isEmpty()) {
 			throw new ServiceException("推送金蝶财务应付单失败：结算明细未解析出任何分录组，请检查货物类型维护");
 		}
-		// 申请付款金额按各组结算金额占比分配（保留 2 位小数、向下取整，尾差计入最后一组）；无结算金额时均摊
-		return new BfiEntryGroupResult(allocateEntryAmounts(groupMap, money(entity.getAppliedAmount()).setScale(2, RoundingMode.HALF_UP)), documentNos);
-	}
-
-	/**
-	 * 申请付款金额按各组结算金额占比分配到分录组（保留 2 位小数、向下取整，尾差计入最后一组）；
-	 * 各组结算金额合计为 0 时按组数均摊
-	 *
-	 * @param groupMap      分录组（按物料编码+计量单位聚合，保持行序）
-	 * @param appliedAmount 申请付款金额（已按 2 位小数格式化）
-	 * @return 应付单分录组（已分配金额）
-	 */
-	private List<BfiEntryGroup> allocateEntryAmounts(LinkedHashMap<String, BfiEntryGroup> groupMap, BigDecimal appliedAmount) {
-		List<BfiEntryGroup> groups = new ArrayList<>(groupMap.values());
-		BigDecimal totalBaseAmount = groups.stream().map(BfiEntryGroup::baseAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-		List<BfiEntryGroup> entryGroups = new ArrayList<>(groups.size());
-		BigDecimal allocatedAmount = BigDecimal.ZERO;
-		for (int index = 0; index < groups.size(); index++) {
-			BfiEntryGroup group = groups.get(index);
-			BigDecimal amount;
-			if (index == groups.size() - 1) {
-				amount = appliedAmount.subtract(allocatedAmount);
-			} else if (totalBaseAmount.compareTo(BigDecimal.ZERO) > 0) {
-				amount = appliedAmount.multiply(group.baseAmount()).divide(totalBaseAmount, 2, RoundingMode.DOWN);
-			} else {
-				amount = appliedAmount.divide(BigDecimal.valueOf(groups.size()), 2, RoundingMode.DOWN);
-			}
-			allocatedAmount = allocatedAmount.add(amount);
-			entryGroups.add(new BfiEntryGroup(group.materialNumber(), group.measureunitNumber(), group.quantity(), group.baseAmount(), amount));
-		}
-		return entryGroups;
+		return new BfiEntryGroupResult(new ArrayList<>(groupMap.values()), documentNos);
 	}
 
 	/**
@@ -1028,18 +1016,20 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 	 * @param cargoCodeByName   货物类型名称->货物编码映射
 	 * @param cargoType         货物类型（支持“、”分隔多类型）
 	 * @param measureunitNumber 计量单位编码（运费计算单位，档案暂无编码字段暂传单位名称）
-	 * @param baseAmount        结算金额（含税），作为申请金额分配基数
+	 * @param amount            结算金额（含税）
+	 * @param amountNoTax       结算金额（不含税）
 	 * @param quantity          运输数量
 	 * @param sourceDesc        来源行描述，用于异常提示
 	 */
 	private void collectEntryGroups(LinkedHashMap<String, BfiEntryGroup> groupMap, Map<String, String> cargoCodeByName,
-									String cargoType, String measureunitNumber, BigDecimal baseAmount, BigDecimal quantity,
-									String sourceDesc) {
+									String cargoType, String measureunitNumber, BigDecimal amount, BigDecimal amountNoTax,
+									BigDecimal quantity, String sourceDesc) {
 		List<String> cargoNames = splitCargoTypes(cargoType);
 		if (Func.isBlank(measureunitNumber)) {
 			throw new ServiceException("推送金蝶财务应付单失败：" + sourceDesc + "计量单位为空，请先维护运费计算单位");
 		}
-		List<BigDecimal> baseShares = splitEqually(baseAmount, cargoNames.size());
+		List<BigDecimal> amountShares = splitEqually(amount, cargoNames.size());
+		List<BigDecimal> amountNoTaxShares = splitEqually(amountNoTax, cargoNames.size());
 		List<BigDecimal> quantityShares = splitEqually(quantity, cargoNames.size());
 		for (int index = 0; index < cargoNames.size(); index++) {
 			String cargoName = cargoNames.get(index);
@@ -1048,9 +1038,9 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 				throw new ServiceException("推送金蝶财务应付单失败：" + sourceDesc + "货物类型[" + cargoName + "]未在货物类型档案中维护编码，请补充后重试");
 			}
 			groupMap.merge(materialNumber + "/" + measureunitNumber,
-				new BfiEntryGroup(materialNumber, measureunitNumber, quantityShares.get(index), baseShares.get(index), BigDecimal.ZERO),
+				new BfiEntryGroup(materialNumber, measureunitNumber, quantityShares.get(index), amountShares.get(index), amountNoTaxShares.get(index)),
 				(left, right) -> new BfiEntryGroup(left.materialNumber(), left.measureunitNumber(),
-					left.quantity().add(right.quantity()), left.baseAmount().add(right.baseAmount()), BigDecimal.ZERO));
+					left.quantity().add(right.quantity()), left.amount().add(right.amount()), left.amountNoTax().add(right.amountNoTax())));
 		}
 	}
 
@@ -1207,7 +1197,9 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 
 	private String bfiCurrency(ContractManage contract) {
 		if (Func.isBlank(contract.getSettlementCurrency())) throw new ServiceException("推送金蝶付款申请失败，合同结算币种不能为空");
-		return contract.getSettlementCurrency();
+		// 金蝶币别代码为 CNY，合同结算币种维护为 RMB 时统一映射
+		String currency = contract.getSettlementCurrency();
+		return "RMB".equalsIgnoreCase(currency) ? "CNY" : currency;
 	}
 
 	private String bfiApplyCause(String paymentType) {
@@ -1226,12 +1218,24 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 			.map(DictBiz::getDictValue).findFirst().orElse(paymentMethod);
 	}
 
-	private String bfiSupplierCode(PaymentApplication entity) {
-		if (Func.isEmpty(entity.getPayeeName())) throw new ServiceException("推送金蝶付款申请失败，收款方不能为空");
+	/** 财务应付单往来类型：合同类别为“客户合同”时为 bd_customer（客户），否则 bd_supplier（供应商） */
+	private String bfiAsstactType(ContractManage contract) {
+		return "客户合同".equals(contract.getContractCategory())
+			? KingdeeBfiConstant.BFI_CUSTOMER_ASSTACT_TYPE : KingdeeBfiConstant.BFI_SUPPLIER_ASSTACT_TYPE;
+	}
+
+	/** 财务应付单往来户.编码：合同乙方关联客商档案取客商编码，未维护时拦截 */
+	private String bfiAsstactNumber(ContractManage contract) {
+		if (Func.isBlank(contract.getPartyB())) {
+			throw new ServiceException("推送金蝶财务应付单失败，合同乙方不能为空，请检查合同[" + Func.toStr(contract.getContractNo()) + "]乙方信息");
+		}
 		CustomerArchive customer = customerArchiveMapper.selectOne(Wrappers.<CustomerArchive>lambdaQuery()
-			.and(wrapper -> wrapper.eq(CustomerArchive::getFullName, entity.getPayeeName()).or().eq(CustomerArchive::getShortName, entity.getPayeeName()))
+			.and(wrapper -> wrapper.eq(CustomerArchive::getFullName, contract.getPartyB()).or().eq(CustomerArchive::getShortName, contract.getPartyB()))
 			.eq(CustomerArchive::getIsDeleted, 0).last("limit 1"));
-		return customer == null || Func.isEmpty(customer.getCustomerCode()) ? entity.getPayeeName() : customer.getCustomerCode();
+		if (customer == null || Func.isBlank(customer.getCustomerCode())) {
+			throw new ServiceException("推送金蝶财务应付单失败，合同乙方[" + contract.getPartyB() + "]未在客商档案中维护客商编码，请补充后重试");
+		}
+		return customer.getCustomerCode();
 	}
 
 	private String bfiProjectNumber(PaymentApplication entity) {
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillQueryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillQueryDTO.java
index 21c88788..e5ee8582 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillQueryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillQueryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serial;
@@ -42,6 +43,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiApBillQueryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillSaveBodyDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillSaveBodyDTO.java
index e9c04810..e27d69d4 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillSaveBodyDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillSaveBodyDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serial;
@@ -37,6 +38,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiApBillSaveBodyDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillSaveDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillSaveDTO.java
index 6d72dcc1..77c73840 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillSaveDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillSaveDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -87,6 +88,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiApBillSaveDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillSaveEntryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillSaveEntryDTO.java
index 992b28fb..690fc500 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillSaveEntryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillSaveEntryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -38,6 +39,7 @@ import java.math.BigDecimal;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiApBillSaveEntryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
@@ -82,9 +84,9 @@ public class BfiApBillSaveEntryDTO implements Serializable {
 	 */
 	private BigDecimal discountrate;
 	/**
-	 * 赠品
+	 * 赠品，默认 false
 	 */
-	private Boolean ispresent;
+	private Boolean ispresent = Boolean.FALSE;
 	/**
 	 * 税率.编码，城矿传 V13（BfiConstant.TAX_RATE_V13）
 	 */
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillSavePlanDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillSavePlanDTO.java
index 9177482e..3a52ca57 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillSavePlanDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillSavePlanDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -38,6 +39,7 @@ import java.math.BigDecimal;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiApBillSavePlanDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillSavePreEntryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillSavePreEntryDTO.java
index 533cd5eb..bdc6eb9a 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillSavePreEntryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiApBillSavePreEntryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -38,6 +39,7 @@ import java.math.BigDecimal;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiApBillSavePreEntryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiArBillQueryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiArBillQueryDTO.java
index 920285de..3be9493a 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiArBillQueryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiArBillQueryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serial;
@@ -42,6 +43,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiArBillQueryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiArBillSaveBodyDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiArBillSaveBodyDTO.java
index ce436bc8..ccabb1a4 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiArBillSaveBodyDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiArBillSaveBodyDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serial;
@@ -37,6 +38,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiArBillSaveBodyDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiArBillSaveDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiArBillSaveDTO.java
index d8ea4287..cee40e45 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiArBillSaveDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiArBillSaveDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -88,6 +89,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiArBillSaveDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiArBillSaveEntryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiArBillSaveEntryDTO.java
index 2633aeba..0afc73c7 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiArBillSaveEntryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiArBillSaveEntryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -38,6 +39,7 @@ import java.math.BigDecimal;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiArBillSaveEntryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiArBillSavePlanDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiArBillSavePlanDTO.java
index 09e9cc8e..5c4545cd 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiArBillSavePlanDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiArBillSavePlanDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -38,6 +39,7 @@ import java.math.BigDecimal;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiArBillSavePlanDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiBaseDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiBaseDTO.java
index 3194c69f..39fa3007 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiBaseDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiBaseDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serial;
@@ -36,6 +37,7 @@ import java.io.Serializable;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiBaseDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiClaimAnnounceQueryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiClaimAnnounceQueryDTO.java
index 1126b084..cd265ad9 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiClaimAnnounceQueryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiClaimAnnounceQueryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serial;
@@ -41,6 +42,7 @@ import java.io.Serializable;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiClaimAnnounceQueryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiClaimPushBodyDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiClaimPushBodyDTO.java
index cd3791f0..c2ce15da 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiClaimPushBodyDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiClaimPushBodyDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serial;
@@ -37,6 +38,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiClaimPushBodyDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiClaimPushDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiClaimPushDTO.java
index 9dd5eadc..262275d8 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiClaimPushDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiClaimPushDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -61,6 +62,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiClaimPushDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiClaimPushEntryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiClaimPushEntryDTO.java
index 45e39ff2..fa214635 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiClaimPushEntryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiClaimPushEntryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -38,6 +39,7 @@ import java.math.BigDecimal;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiClaimPushEntryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerBankEntryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerBankEntryDTO.java
index e623bf84..9409c582 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerBankEntryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerBankEntryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -37,6 +38,7 @@ import java.io.Serializable;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiCustomerBankEntryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerGroupEntryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerGroupEntryDTO.java
index a98523b7..4b627c85 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerGroupEntryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerGroupEntryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -39,6 +40,7 @@ import java.io.Serializable;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiCustomerGroupEntryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerLinkmanEntryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerLinkmanEntryDTO.java
index a359a935..5e5b3d1e 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerLinkmanEntryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerLinkmanEntryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -37,6 +38,7 @@ import java.io.Serializable;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiCustomerLinkmanEntryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerQueryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerQueryDTO.java
index 9a9a5ba8..fdb21b8d 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerQueryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerQueryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -38,6 +39,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiCustomerQueryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerSaveBodyDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerSaveBodyDTO.java
index 95ce9ccc..0dba631c 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerSaveBodyDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerSaveBodyDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serial;
@@ -37,6 +38,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiCustomerSaveBodyDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerSaveDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerSaveDTO.java
index d115fae6..102fd1a9 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerSaveDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiCustomerSaveDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -67,6 +68,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiCustomerSaveDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiExchangeRateQueryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiExchangeRateQueryDTO.java
index ce358a38..b07e8e24 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiExchangeRateQueryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiExchangeRateQueryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serial;
@@ -36,6 +37,7 @@ import java.io.Serializable;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiExchangeRateQueryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplyOpenApiBodyDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplyOpenApiBodyDTO.java
index 25a052c8..5f10fa6d 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplyOpenApiBodyDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplyOpenApiBodyDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -46,6 +47,7 @@ import java.io.Serializable;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiInvoiceApplyOpenApiBodyDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplyOpenApiQueryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplyOpenApiQueryDTO.java
index 1b641a03..d30e7442 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplyOpenApiQueryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplyOpenApiQueryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -37,6 +38,7 @@ import java.io.Serializable;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiInvoiceApplyOpenApiQueryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplyQueryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplyQueryDTO.java
index 55e118e3..99953850 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplyQueryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplyQueryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serial;
@@ -42,6 +43,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiInvoiceApplyQueryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplySaveBodyDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplySaveBodyDTO.java
index c5f42eb6..d430026c 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplySaveBodyDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplySaveBodyDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serial;
@@ -37,6 +38,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiInvoiceApplySaveBodyDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplySaveDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplySaveDTO.java
index 371865c3..d96b7beb 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplySaveDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplySaveDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -82,6 +83,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiInvoiceApplySaveDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplySaveEntryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplySaveEntryDTO.java
index b5133f79..4ea5c855 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplySaveEntryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceApplySaveEntryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -38,6 +39,7 @@ import java.math.BigDecimal;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiInvoiceApplySaveEntryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceAssignBodyDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceAssignBodyDTO.java
index 06e98aef..8a5df05a 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceAssignBodyDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceAssignBodyDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -55,6 +56,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiInvoiceAssignBodyDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceAssignItemDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceAssignItemDTO.java
index 1b8816d3..6818170a 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceAssignItemDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceAssignItemDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -38,6 +39,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiInvoiceAssignItemDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceAssignRefDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceAssignRefDTO.java
index 1d70283f..954b7b7f 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceAssignRefDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceAssignRefDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -37,6 +38,7 @@ import java.io.Serializable;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiInvoiceAssignRefDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceDownloadDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceDownloadDTO.java
index d39b0975..d1f3165e 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceDownloadDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoiceDownloadDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -44,6 +45,7 @@ import java.io.Serializable;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiInvoiceDownloadDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoicePoolQueryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoicePoolQueryDTO.java
index cd2c7628..076f5464 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoicePoolQueryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoicePoolQueryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serial;
@@ -47,6 +48,7 @@ import java.util.Map;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiInvoicePoolQueryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplyPushBodyDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplyPushBodyDTO.java
index 5c7343e5..06f30c23 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplyPushBodyDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplyPushBodyDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serial;
@@ -37,6 +38,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiPayApplyPushBodyDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplyPushDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplyPushDTO.java
index 65dc630f..fe00d2f2 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplyPushDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplyPushDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -38,6 +39,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiPayApplyPushDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplyPushEntryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplyPushEntryDTO.java
index 1e981b7a..19b565e0 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplyPushEntryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplyPushEntryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -38,6 +39,7 @@ import java.math.BigDecimal;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiPayApplyPushEntryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplyQueryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplyQueryDTO.java
index 9770b8b1..a56e7766 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplyQueryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplyQueryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serial;
@@ -37,6 +38,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiPayApplyQueryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplySaveBodyDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplySaveBodyDTO.java
index 243250b1..b3a4e0d5 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplySaveBodyDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplySaveBodyDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serial;
@@ -37,6 +38,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiPayApplySaveBodyDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplySaveDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplySaveDTO.java
index 46c923cf..d632b4f4 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplySaveDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplySaveDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -38,6 +39,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiPayApplySaveDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplySaveEntryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplySaveEntryDTO.java
index 06232353..40094b5a 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplySaveEntryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayApplySaveEntryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -38,6 +39,7 @@ import java.math.BigDecimal;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiPayApplySaveEntryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayBillQueryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayBillQueryDTO.java
index 5edd53fe..07a88861 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayBillQueryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayBillQueryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serial;
@@ -37,6 +38,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiPayBillQueryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiRecBillQueryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiRecBillQueryDTO.java
index 2930a922..90ed5056 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiRecBillQueryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiRecBillQueryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -43,6 +44,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiRecBillQueryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiReceivedInvoiceQueryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiReceivedInvoiceQueryDTO.java
index 265ade13..c2a2e18b 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiReceivedInvoiceQueryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiReceivedInvoiceQueryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serial;
@@ -41,6 +42,7 @@ import java.io.Serializable;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiReceivedInvoiceQueryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiReceivedInvoiceSaveBodyDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiReceivedInvoiceSaveBodyDTO.java
index 4fc80aaf..7eaa42cb 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiReceivedInvoiceSaveBodyDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiReceivedInvoiceSaveBodyDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serial;
@@ -37,6 +38,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiReceivedInvoiceSaveBodyDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiReceivedInvoiceSaveDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiReceivedInvoiceSaveDTO.java
index b8e9b470..294c9aab 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiReceivedInvoiceSaveDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiReceivedInvoiceSaveDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -81,6 +82,7 @@ import java.util.List;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiReceivedInvoiceSaveDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiReceivedInvoiceSaveEntryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiReceivedInvoiceSaveEntryDTO.java
index 2b54c41f..8495b03b 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiReceivedInvoiceSaveEntryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiReceivedInvoiceSaveEntryDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -38,6 +39,7 @@ import java.math.BigDecimal;
  * @author Chill
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiReceivedInvoiceSaveEntryDTO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiTokenDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiTokenDTO.java
index 3af7aa79..6e9780ce 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiTokenDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiTokenDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -39,6 +40,7 @@ import java.io.Serializable;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiTokenDTO extends BfiBaseDTO {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiVerifyTokenDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiVerifyTokenDTO.java
index 67bdfa65..7fa44874 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiVerifyTokenDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiVerifyTokenDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -39,6 +40,7 @@ import java.io.Serializable;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiVerifyTokenDTO extends BfiBaseDTO {
 	@Serial
 	private static final long serialVersionUID = 1L;
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiWithdrawTokenDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiWithdrawTokenDTO.java
index d8c92678..fdfa6b49 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiWithdrawTokenDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiWithdrawTokenDTO.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.thirdparty.bfi.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -39,6 +40,7 @@ import java.io.Serializable;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BfiWithdrawTokenDTO extends BfiBaseDTO {
 	@Serial
 	private static final long serialVersionUID = 1L;