From a981c07d34edd0975b9d556d97c1f851ce79974c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 04 十二月 2024 13:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java b/ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java
index fba67dd..bbb2401 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java
@@ -44,9 +44,17 @@
@TableField("order_status")
private Integer orderStatus;
+ @ApiModelProperty(value = "是否已分佣: 0-否 1-是")
+ @TableField("is_commission")
+ private Integer isCommission;
+
@ApiModelProperty(value = "核销时间")
@TableField("end_time")
private LocalDateTime endTime;
+
+ @ApiModelProperty(value = "售后截止日期")
+ @TableField("after_sale_time")
+ private LocalDateTime afterSaleTime;
@ApiModelProperty(value = "技师id")
@TableField("technician_id")
@@ -56,9 +64,46 @@
@TableField("order_number")
private String orderNumber;
+ @ApiModelProperty(value = "商品数量")
+ @TableField("num")
+ private Integer num;
+
+ @ApiModelProperty(value = "商品封面（多张逗号隔开，最多三张））")
+ @TableField("good_pics")
+ private String goodPics;
+
+ @ApiModelProperty(value = "商品名称（多个名称逗号隔开））")
+ @TableField("good_name")
+ private String goodName;
+
@ApiModelProperty(value = "订单总金额")
@TableField("total_amount")
private BigDecimal totalAmount;
+
+ @ApiModelProperty(value = "满减金额")
+ @TableField("full_reduction_amount")
+ private BigDecimal fullReductionAmount;
+
+ @ApiModelProperty(value = "代金券抵扣金额")
+ @TableField("money_amount")
+ private BigDecimal moneyAmount;
+
+ @ApiModelProperty(value = "折扣券抵扣金额")
+ @TableField("discount_amount")
+ private BigDecimal discountAmount;
+
+ @ApiModelProperty(value = "商品券抵扣总金额")
+ @TableField("good_amount")
+ private BigDecimal goodAmount;
+
+ @ApiModelProperty(value = "活动优惠金额")
+ @TableField("activity_amount")
+ private BigDecimal activityAmount;
+
+ @ApiModelProperty(value = "优惠总金额")
+ @TableField("discount_total_amount")
+ private BigDecimal discountTotalAmount;
+
@ApiModelProperty(value = "实际支付价格")
@TableField("payment_amount")
@@ -66,7 +111,7 @@
@ApiModelProperty(value = "使用积分")
@TableField("point")
- private BigDecimal point;
+ private Integer point;
@ApiModelProperty(value = "1wx2积分")
@TableField("pay_method")
@@ -75,6 +120,10 @@
@ApiModelProperty(value = "使用的优惠劵json")
@TableField("coupon_json")
private String couponJson;
+
+ @ApiModelProperty(value = "订单优惠活动的json快照")
+ @TableField("activity_json")
+ private String activityJson;
@ApiModelProperty(value = "运费")
@TableField("express_amount")
@@ -94,7 +143,7 @@
@ApiModelProperty(value = "本单获取的积分")
@TableField("get_point")
- private BigDecimal getPoint;
+ private Integer getPoint;
@ApiModelProperty(value = "微信支付号")
@TableField("serial_number")
--
Gitblit v1.7.1