From 5d02cf6ba780f088b24f62cf8db94bf63707db57 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 10 九月 2024 10:14:46 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/XinQuanHealing
---
xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/domain/OrderPaymentRecord.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/domain/OrderPaymentRecord.java b/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/domain/OrderPaymentRecord.java
index bf57374..e221bf9 100644
--- a/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/domain/OrderPaymentRecord.java
+++ b/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/domain/OrderPaymentRecord.java
@@ -1,13 +1,13 @@
package com.xinquan.order.domain;
import com.baomidou.mybatisplus.annotation.IdType;
-import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.xinquan.common.core.web.domain.BaseModel;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -35,7 +35,7 @@
@TableField("order_id")
private Long orderId;
- @ApiModelProperty(value = "支付类型 1=微信支付 2=支付宝支付 3=余额支付 4=IOS内购支付")
+ @ApiModelProperty(value = "支付类型 1=微信支付 2=支付宝支付 3=IOS内购支付 4=余额支付")
@TableField("payment_type")
private Integer paymentType;
@@ -43,9 +43,11 @@
@TableField("pay_amount")
private BigDecimal payAmount;
- @ApiModelProperty(value = "支付商户订单号")
+ @ApiModelProperty(value = "第三方支付订单号")
@TableField("pay_order_no")
private String payOrderNo;
-
+ @ApiModelProperty(value = "支付状态 1=待支付 2=已完成 3=已取消")
+ @TableField("payment_status")
+ private Integer paymentStatus;
}
--
Gitblit v1.7.1