From 41422cb74d137e590fefefa4390cd6eedc02a0fb Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 16 六月 2025 16:19:03 +0800
Subject: [PATCH] 对接部分抖音接口

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java
index 7217d93..06adc1b 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java
@@ -27,7 +27,7 @@
     @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
     private Integer orderStatus;
 
-    @ApiModelProperty(value="订单来源1.商城2.秒杀活动3.线下创建")
+    @ApiModelProperty(value = "订单来源1.商城2.秒杀活动3.线下创建4.抽奖5.美团6.抖音7.快手")
     private Integer orderFrom;
 
     @ApiModelProperty(value = "商品总价")
@@ -73,25 +73,28 @@
 
     @ApiModelProperty(value = "用户姓名")
     private String userName;
-
+    
     @ApiModelProperty(value = "用户电话")
     private String userMobile;
-
-    @ApiModelProperty(value="实收金额")
+    
+    @ApiModelProperty(value = "实收金额")
     
     private BigDecimal realReceiveMoney;
-
-    @ApiModelProperty(value="已收金额")
+    
+    @ApiModelProperty(value = "已收金额")
     
     private BigDecimal receiveMoney;
-
-    @ApiModelProperty(value="未收金额")
+    
+    @ApiModelProperty(value = "未收金额")
     
     private BigDecimal unReceiveMoney;
-
-    @ApiModelProperty(value="支付方式1.全款2订金")
+    
+    @ApiModelProperty(value = "支付方式1.全款2订金")
     private Integer payType;
-
-    @ApiModelProperty(value="结清标记0否1是")
+    
+    @ApiModelProperty(value = "结清标记0否1是")
     private Integer closeFlag;
+    
+    @ApiModelProperty(value = "剩余可核销次数")
+    private Integer laveTime;
 }

--
Gitblit v1.7.1