From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderPayment.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderPayment.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderPayment.java
index 20d618b..eb61951 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderPayment.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderPayment.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
+import com.google.gson.annotations.SerializedName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -49,10 +50,23 @@
@TableField("shop_id")
private Long shopId;
/**
+ * 订单二级商户号
+ */
+ @TableField("sub_mch_id")
+ private String subMchId;
+
+ /**
* 订单id
*/
@TableField("order_id")
private String orderId;
+
+ /**
+ * 微信支付交易号
+ */
+ @TableField("out_trade_no")
+ private String outTradeNo;
+
/**
* 支付状态1发起支付2支付成功3支付失败4已关闭
*/
@@ -63,6 +77,11 @@
*/
@TableField("pay_money")
private BigDecimal payMoney;
+ /**
+ * 手续费
+ */
+ @TableField("fee_amount")
+ private BigDecimal feeAmount;
/**
* 失效时间
*/
@@ -104,6 +123,8 @@
@TableField("back_time")
private Date backTime;
+ @TableField("transaction_id")
+ private String transactionId;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1