From 611332c6e1b51b00b9b259c14499ff8725bb98ca Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 07 五月 2025 09:42:14 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java
index 2918b8e..9a59b64 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java
@@ -61,7 +61,9 @@
@ApiModelProperty("站点名称")
@TableField("site_name")
private String siteName;
-
+ @ApiModelProperty("拉起确认收款页面参数")
+ @TableField("package_info")
+ private String packageInfo;
@ApiModelProperty("回收服务id")
@TableField("serve_id")
private Integer serveId;
@@ -115,7 +117,7 @@
@TableField("reservation_remark")
private String reservationRemark;
- @ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派，6:待改派)")
+ @ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派，6:待改派，7：待预约)")
@TableField("state")
private Integer state;
@@ -145,7 +147,7 @@
@TableField("subsidy")
private BigDecimal subsidy;
- @ApiModelProperty("是否已提现(0:未提现，1:已提现)")
+ @ApiModelProperty("是否已提现(0:未提现，1:审核中 2审核通过 3:已确认收款)")
@TableField("is_withdrawal")
private Integer isWithdrawal;
@@ -177,6 +179,28 @@
@TableField(exist = false)
private String applyReason;
+ @ApiModelProperty("代派单")
+ @TableField(exist = false)
+ private Integer toBeDispatched=0;
+ @ApiModelProperty("待上门")
+ @TableField(exist = false)
+ private Integer stayDoorstep=0;
+ @ApiModelProperty("带完工")
+ @TableField(exist = false)
+ private Integer toBeCompleted=0;
+ @ApiModelProperty("已完结")
+ @TableField(exist = false)
+ private Integer completed=0;
+ @ApiModelProperty("已取消")
+ @TableField(exist = false)
+ private Integer canceled =0;
+ @ApiModelProperty("再投数量")
+ @TableField(exist = false)
+ private Integer reInvestment=0;
+ @ApiModelProperty("待预约数量")
+ @TableField(exist = false)
+ private Integer pending=0;
+
@ApiModelProperty("是否为再投单")
@TableField("is_reinvest")
private Integer isReinvest;
--
Gitblit v1.7.1