From 23ea7e81c68673501faad67f7ad3137fddd4ef70 Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 05 八月 2023 18:30:10 +0800
Subject: [PATCH] 1、定时任务 商户进件状态查询 2、小程序下单统一支付提交 3、订单核销分账 4、订单退款 5、支付、退款回调 6、分账回调 7、支付参数yml配置
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java
index fb86dcf..688955d 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java
@@ -1,16 +1,16 @@
package com.ruoyi.order.domain.pojo.order;
-import java.math.BigDecimal;
-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>
@@ -136,6 +136,11 @@
@TableField("use_time")
private Date useTime;
/**
+ * 线下支付时间
+ */
+ @TableField("off_pay_time")
+ private Date offPayTime;
+ /**
* 取消时间
*/
@TableField("cancel_time")
@@ -156,6 +161,25 @@
@TableField("close_flag")
private Integer closeFlag;
+ /**
+ * 活动id
+ */
+ @TableField("activity_id")
+ private String activityId;
+
+ /**
+ * 活动名称
+ */
+ @TableField("activity_name")
+ private String activityName;
+
+ /**
+ * 应收金额
+ */
+ @TableField("change_receivable_money")
+ private BigDecimal changeReceivableMoney;
+
+
@Override
protected Serializable pkVal() {
return this.orderId;
--
Gitblit v1.7.1