From cb7c05fc03a8f6f0df74946646e7e8601713a6af Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Fri, 11 Jul 2025 10:13:46 +0800
Subject: [PATCH] =?UTF-8?q?##=20Feat=20-=20=E5=90=8E=E5=8F=B0=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=88=86=E8=B4=A6=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/third/pay/TOnlinePayment.java       | 12 ++++++++++++
 .../pay/service/impl/JdPayServiceImpl.java     |  4 ++++
 .../com/hzs/third/pay/vo/OnlinePaymentVO.java  | 18 ++++++++++++++++++
 ...2025年7月10日_京东支付_增加主子账户金额.sql |  7 +++++++
 4 files changed, 41 insertions(+)
 create mode 100644 sql/2025年7月10日_京东支付_增加主子账户金额.sql

diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/pay/TOnlinePayment.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/pay/TOnlinePayment.java
index 780ced63..9d323a18 100644
--- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/pay/TOnlinePayment.java
+++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/pay/TOnlinePayment.java
@@ -120,6 +120,18 @@ public class TOnlinePayment extends BaseEntity {
     @TableField("PAY_SOURCE")
     private Integer paySource;
 
+    /**
+     * 主账户金额
+     */
+    @TableField("MAIN_ACCOUNT_MONEY")
+    private BigDecimal mainAccountMoney;
+
+    /**
+     * 子账户金额
+     */
+    @TableField("SUB_ACCOUNT_MONEY")
+    private BigDecimal subAccountMoney;
+
     /**
      * 支付-前端回调页面的扩展参数
      */
diff --git a/bd-third/src/main/java/com/hzs/third/pay/service/impl/JdPayServiceImpl.java b/bd-third/src/main/java/com/hzs/third/pay/service/impl/JdPayServiceImpl.java
index fdbc8407..9708e4d7 100644
--- a/bd-third/src/main/java/com/hzs/third/pay/service/impl/JdPayServiceImpl.java
+++ b/bd-third/src/main/java/com/hzs/third/pay/service/impl/JdPayServiceImpl.java
@@ -131,9 +131,13 @@ public class JdPayServiceImpl implements IJdPayService {
                         BigDecimal subTradeAmount;
                         if(i == separateAccounts.size() - 1){
                             subTradeAmount = remaining;
+                            log.info("分账 最后一个账户( 总 - 已分账 ) : {}, {}", subTradeAmount, remaining);
+                            onlinePayment.setSubAccountMoney(subTradeAmount);
                         }else{
                             subTradeAmount = tradeAmount.subtract(tradeAmount.multiply(separateAccount.getProportion().setScale(2, BigDecimal.ROUND_DOWN)).setScale(2, BigDecimal.ROUND_DOWN));
                             remaining = remaining.subtract(subTradeAmount).setScale(2, BigDecimal.ROUND_DOWN);
+                            onlinePayment.setMainAccountMoney(subTradeAmount);
+                            log.info("分账 过程 : {}, {}, {}", subTradeAmount, remaining, separateAccount.getProportion().setScale(2, BigDecimal.ROUND_DOWN));
                         }
                         JdPayDivisionAccountTradeInfo divisionAccountTradeInfo = new JdPayDivisionAccountTradeInfo();
                         divisionAccountTradeInfo.setMerchantNo(separateAccount.getAccount());
diff --git a/bd-third/src/main/java/com/hzs/third/pay/vo/OnlinePaymentVO.java b/bd-third/src/main/java/com/hzs/third/pay/vo/OnlinePaymentVO.java
index 1f868f11..3efb2806 100644
--- a/bd-third/src/main/java/com/hzs/third/pay/vo/OnlinePaymentVO.java
+++ b/bd-third/src/main/java/com/hzs/third/pay/vo/OnlinePaymentVO.java
@@ -1,7 +1,9 @@
 package com.hzs.third.pay.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.hzs.common.core.annotation.BigDecimalFormat;
 import com.hzs.common.core.annotation.Excel;
 import com.hzs.common.core.annotation.Transaction;
 import com.hzs.common.core.constant.EnumsPrefixConstants;
@@ -144,4 +146,20 @@ public class OnlinePaymentVO {
      */
     private String callbackInfo;
 
+    /**
+     * 主账户金额
+     */
+    @TableField("MAIN_ACCOUNT_MONEY")
+    @Excel(name = "主账户金额")
+    @BigDecimalFormat
+    private BigDecimal mainAccountMoney;
+
+    /**
+     * 子账户金额
+     */
+    @TableField("SUB_ACCOUNT_MONEY")
+    @Excel(name = "子账户金额")
+    @BigDecimalFormat
+    private BigDecimal subAccountMoney;
+
 }
diff --git a/sql/2025年7月10日_京东支付_增加主子账户金额.sql b/sql/2025年7月10日_京东支付_增加主子账户金额.sql
new file mode 100644
index 00000000..c93d1fbe
--- /dev/null
+++ b/sql/2025年7月10日_京东支付_增加主子账户金额.sql
@@ -0,0 +1,7 @@
+ALTER TABLE "T_ONLINE_PAYMENT"
+    ADD ("MAIN_ACCOUNT_MONEY" NUMBER(16,2))
+ADD ("SUB_ACCOUNT_MONEY" NUMBER(16,2));
+
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT"."MAIN_ACCOUNT_MONEY" IS '分账-主账户金额';
+
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT"."SUB_ACCOUNT_MONEY" IS '分账-子账户金额'