opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-18 09:35:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修改订单明细

Browse Source
This commit is contained in:
hans 2025-08-30 22:07:11 +08:00
parent c6859d0ee9
commit 21d1518aa1
3 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/Order.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.translation.annotation.Translation;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.translation.constant.TransConstant;
@ -26,7 +28,7 @@ public class Order extends TenantEntity {
private static final long serialVersionUID = 1L;
/**
*
*
*/
@TableId(value = "id")
private Long id;
@ -59,27 +61,27 @@ public class Order extends TenantEntity {
/**
* 销售价格
*/
private Long sellingPrice;
private BigDecimal sellingPrice;
/**
* 邮费
*/
private Long mailPrice;
private BigDecimal mailPrice;
/**
* 实收价格
*/
private Long actualPrice;
private BigDecimal actualPrice;
/**
* 订单总额
*/
private Long totalPrice;
private BigDecimal totalPrice;
/**
* 退款金额
*/
private Long refundMoney;
private BigDecimal refundMoney;
/**
* 订单状态（0未收款，1已收款，2已发货，3已签收，4已完成,5已取消，6申请退款，7申请退货，8退货已发货，9退货已签收，10退货成功）

27
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/OrderBo.java
View File

@ -9,6 +9,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.common.translation.annotation.Translation;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.translation.constant.TransConstant;
@ -25,7 +27,7 @@ import org.dromara.common.translation.constant.TransConstant;
public class OrderBo extends BaseEntity {
/**
*
*
*/
private Long id;
@ -38,19 +40,16 @@ public class OrderBo extends BaseEntity {
/**
* 顾客电话
*/
@NotBlank(message = "顾客电话不能为空", groups = { AddGroup.class, EditGroup.class })
private String customerPhone;
/**
* 顾客id
*/
@NotNull(message = "顾客id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long customerId;
/**
* 产品名称
*/
@NotBlank(message = "产品名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String productName;
/**
@ -63,36 +62,31 @@ public class OrderBo extends BaseEntity {
* 销售价格
*/
@NotNull(message = "销售价格不能为空", groups = { AddGroup.class, EditGroup.class })
private Long sellingPrice;
private BigDecimal sellingPrice;
/**
* 邮费
*/
@NotNull(message = "邮费不能为空", groups = { AddGroup.class, EditGroup.class })
private Long mailPrice;
private BigDecimal mailPrice;
/**
* 实收价格
*/
@NotNull(message = "实收价格不能为空", groups = { AddGroup.class, EditGroup.class })
private Long actualPrice;
private BigDecimal actualPrice;
/**
* 订单总额
*/
@NotNull(message = "订单总额不能为空", groups = { AddGroup.class, EditGroup.class })
private Long totalPrice;
private BigDecimal totalPrice;
/**
* 退款金额
*/
@NotNull(message = "退款金额不能为空", groups = { AddGroup.class, EditGroup.class })
private Long refundMoney;
private BigDecimal refundMoney;
/**
* 订单状态（0未收款，1已收款，2已发货，3已签收，4已完成,5已取消，6申请退款，7申请退货，8退货已发货，9退货已签收，10退货成功）
*/
@NotBlank(message = "订单状态（0未收款，1已收款，2已发货，3已签收，4已完成,5已取消，6申请退款，7申请退货，8退货已发货，9退货已签收，10退货成功）不能为空", groups = { AddGroup.class, EditGroup.class })
private String orderStatus;
/**
@ -104,31 +98,26 @@ public class OrderBo extends BaseEntity {
/**
* 支付时间
*/
@NotNull(message = "支付时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date payTime;
/**
* 发货时间
*/
@NotNull(message = "发货时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date shipmentTime;
/**
* 发货图片
*/
@NotBlank(message = "发货图片不能为空", groups = { AddGroup.class, EditGroup.class })
private String shipmentImage;
/**
* 快递单号
*/
@NotBlank(message = "快递单号不能为空", groups = { AddGroup.class, EditGroup.class })
private String trackingNumber;
/**
* 备注
*/
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
private String remark;

14
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/OrderVo.java
View File

@ -1,6 +1,8 @@
package org.dromara.system.domain.vo;
import org.dromara.common.translation.annotation.Translation;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.translation.constant.TransConstant;
@ -33,7 +35,7 @@ public class OrderVo implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*
*/
@ExcelProperty(value = "")
private Long id;
@ -77,31 +79,31 @@ public class OrderVo implements Serializable {
* 销售价格
*/
@ExcelProperty(value = "销售价格")
private Long sellingPrice;
private BigDecimal sellingPrice;
/**
* 邮费
*/
@ExcelProperty(value = "邮费")
private Long mailPrice;
private BigDecimal mailPrice;
/**
* 实收价格
*/
@ExcelProperty(value = "实收价格")
private Long actualPrice;
private BigDecimal actualPrice;
/**
* 订单总额
*/
@ExcelProperty(value = "订单总额")
private Long totalPrice;
private BigDecimal totalPrice;
/**
* 退款金额
*/
@ExcelProperty(value = "退款金额")
private Long refundMoney;
private BigDecimal refundMoney;
/**
* 订单状态（0未收款，1已收款，2已发货，3已签收，4已完成,5已取消，6申请退款，7申请退货，8退货已发货，9退货已签收，10退货成功）