From 1af77abfa06a1a0d537bb120ae0c362aae9d3b83 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 30 七月 2025 10:14:40 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderRefund.java | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderRefund.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderRefund.java
index eda0c00..906c44a 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderRefund.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderRefund.java
@@ -1,15 +1,16 @@
package com.ruoyi.order.domain.pojo.account;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* <p>
@@ -46,7 +47,7 @@
* 售后id
*/
@TableField("after_sales_id")
- private Integer afterSalesId;
+ private String afterSalesId;
/**
* 订单id
*/
@@ -56,17 +57,17 @@
* 用户id
*/
@TableField("user_id")
- private Integer userId;
+ private Long userId;
/**
* 商户id
*/
@TableField("shop_id")
- private Integer shopId;
+ private Long shopId;
/**
* 退款金额
*/
@TableField("refund_money")
- private String refundMoney;
+ private BigDecimal refundMoney;
/**
* 退款理由
*/
@@ -76,7 +77,7 @@
* 订单金额
*/
@TableField("order_money")
- private String orderMoney;
+ private BigDecimal orderMoney;
/**
* 退款出资商户
REFUND_SOURCE_PARTNER_ADVANCE : 电商平台垫付，需要向微信支付申请开通
@@ -98,7 +99,21 @@
* 回调时间
*/
@TableField("back_time")
- private Date backTime;
+ private String backTime;
+
+ /**
+ * 微信退款订单id
+ */
+ @TableField("wx_refund_id")
+ private String wxRefundId;
+
+ /**
+ * 1、发起退款 2、已退款
+ */
+ @TableField("refund_status")
+ private Integer refundStatus;
+
+
@Override
--
Gitblit v1.7.1