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 4ec0ec8e..fc0fa83b 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 @@ -122,6 +122,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 eea20a78..b8e7bfa6 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 @@ -271,9 +271,11 @@ public class JdPayServiceImpl implements IJdPayService { 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(); 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 51484fdc..474e39d4 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; @@ -128,4 +130,20 @@ public class OnlinePaymentVO { */ private Integer pkCountry; + /** + * 主账户金额 + */ + @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 '分账-子账户金额'