From 21d1518aa12c3ebb968b38580385c730ae77a1ea Mon Sep 17 00:00:00 2001
From: hans <2216464999@qq.com>
Date: Sat, 30 Aug 2025 22:07:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/system/domain/Order.java | 14 +++++-----
 .../org/dromara/system/domain/bo/OrderBo.java | 27 ++++++-------------
 .../org/dromara/system/domain/vo/OrderVo.java | 14 +++++-----
 3 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/Order.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/Order.java
index d94077841..0da8ccaca 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/Order.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/Order.java
@@ -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退货成功）
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/OrderBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/OrderBo.java
index e22afd204..05a2f46ec 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/OrderBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/OrderBo.java
@@ -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;
 
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/OrderVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/OrderVo.java
index 23364ac71..0853b8645 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/OrderVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/OrderVo.java
@@ -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退货成功）