From b8abd1c4081c2c67c1f258b9956f4c60652d831d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 27 八月 2025 17:13:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java | 84 +++++++++++++-----------------------------
1 files changed, 26 insertions(+), 58 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java
index ffdb0e4..18a9ec0 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java
@@ -1,11 +1,14 @@
package com.ruoyi.order.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.common.core.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
/**
* @author zhibing.pu
@@ -15,69 +18,34 @@
@ApiModel
public class OrderPageListVo {
@ApiModelProperty("订单id")
- private String id;
+ private Long id;
+ @ApiModelProperty("订单idStr")
+ private String idStr;
@ApiModelProperty("订单编号")
@Excel(name = "订单编号")
- private String code;
- @ApiModelProperty("订单状态（1待发货2待收货3待使用4已完成5已取消6已退款7售后中8已评价）")
- @Excel(name = "订单状态", readConverterExp = "1=待发货,2=待收货,3=待使用,4=已完成,5=已取消,6=已退款,7=售后中,8=已评价")
- private Integer status;
- @ApiModelProperty("下单时间")
- @Excel(name = "下单时间")
- private String createTime;
- @ApiModelProperty("售后截止时间")
- private String afterSaleTime;
- @ApiModelProperty("下单用户")
- @Excel(name = "下单用户")
- private String userName;
- @ApiModelProperty("联系电话")
- @Excel(name = "联系方式")
+ private String orderNumber;
+ @ApiModelProperty("订单状态（3待使用4已完成5已取消6已退款7售后中8已评价）")
+ @Excel(name = "订单状态", readConverterExp = "3=待使用,4=已完成,5=已取消,6=已退款,7=售后中,8=已评价")
+ private Integer orderStatus;
+ @ApiModelProperty(value = "下单时间")
+ private LocalDateTime createTime;
+ @ApiModelProperty(value = "商品名称（多个名称逗号隔开））")
+ private String goodName;
+ @ApiModelProperty(value = "商品封面（多张逗号隔开，最多三张））")
+ private String goodPics;
+ @ApiModelProperty(value = "订单总金额")
+ private BigDecimal totalAmount;
+ @ApiModelProperty(value = "商品数量")
+ private Integer num;
+ @ApiModelProperty(value = "用户手机号")
private String phone;
- @ApiModelProperty("商品类型（1=服务，2=单品）")
- @Excel(name = "订单类型", readConverterExp = "1=服务,2=单品")
- private Integer goodsType;
- @ApiModelProperty("支付方式（1=微信，2=余额，3=积分）")
- private Integer paymentType;
- @ApiModelProperty("订单金额")
- @Excel(name = "支付金额")
- private BigDecimal orderMoney;
- @ApiModelProperty("订单积分")
- private BigDecimal point;
- @ApiModelProperty("配送方式（1=自提，2=快递）")
- private Integer distributionMode;
- @ApiModelProperty("获得分佣")
- private BigDecimal getCommission;
- // 快递单号
- @Excel(name = "快递单号")
- private String expressNum;
- // 快递公司
- @Excel(name = "快递公司")
- private String expressCompany;
- // 省
- @Excel(name = "省")
- private String deliverProvince;
- // 市
- @Excel(name = "省区划代码")
- private String deliverProvinceCode;
- // 省区划代码
- @Excel(name = "市")
- private String deliverCity;
- // 市区划代码
- @Excel(name = "市区划代码")
- private String deliverCityCode;
- /**
- * 用户id
- */
- private Long appUserId;
- @ApiModelProperty("售后订单id")
- private String refundPassId;
+ @ApiModelProperty(value = "售后截止日期")
+ private LocalDateTime afterSaleTime;
- private Integer shopId;
+ @ApiModelProperty(value = "实际支付价格")
+ private BigDecimal paymentAmount;
- private String expressJson;
+ List<Long> appUserIds;
- public BigDecimal getGetPoint(){
- return point;
- }
}
--
Gitblit v1.7.1