Browse Source

feat(order): 订单金额字段类型优化及商品价格字段扩展

- 将订单主表中的运费、总金额、应付金额字段从Long类型改为BigDecimal类型
- 将订单商品表中新增税率、市场价格、会员价格、采购价格、最高采购价格等价格相关字段
- 完善订单商品表的价格体系,支持更精确的价格计算和展示
- 优化金额计算精度,避免整数类型导致的精度丢失问题
hurx 3 months ago
parent
commit
d4bc8ae444

+ 3 - 3
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/OrderMain.java

@@ -138,17 +138,17 @@ public class OrderMain extends TenantEntity {
     /**
      * 运费(元)
      */
-    private Long shippingFee;
+    private BigDecimal shippingFee;
 
     /**
      * 订单总金额(元)
      */
-    private Long totalAmount;
+    private BigDecimal totalAmount;
 
     /**
      * 应付金额(元)
      */
-    private Long payableAmount;
+    private BigDecimal payableAmount;
 
     /**
      * 支付状态

+ 26 - 0
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/OrderProduct.java

@@ -81,6 +81,32 @@ public class OrderProduct extends TenantEntity {
      */
     private BigDecimal platformPrice;
 
+    /**
+     * 税率
+     */
+    private BigDecimal taxRate;
+
+    /**
+     * 市场价格
+     */
+    private BigDecimal marketPrice;
+
+    /**
+     * 会员价格
+     */
+    private BigDecimal memberPrice;
+
+    /**
+     * 采购价格
+     */
+    private BigDecimal purchasingPrice;
+
+    /**
+     * 最高采购价格
+     */
+    private BigDecimal maxPurchasePrice;
+
+
     /**
      * 最小起订量
      */

+ 3 - 3
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/bo/OrderMainBo.java

@@ -139,17 +139,17 @@ public class OrderMainBo extends BaseEntity {
      * 运费(元)
      */
     @NotNull(message = "运费(元)不能为空", groups = {AddGroup.class, EditGroup.class})
-    private Long shippingFee;
+    private BigDecimal shippingFee;
 
     /**
      * 订单总金额(元)
      */
-    private Long totalAmount;
+    private BigDecimal totalAmount;
 
     /**
      * 应付金额(元)
      */
-    private Long payableAmount;
+    private BigDecimal payableAmount;
 
     /**
      * 支付状态

+ 25 - 0
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/bo/OrderProductBo.java

@@ -80,6 +80,31 @@ public class OrderProductBo extends BaseEntity {
      */
     private BigDecimal platformPrice;
 
+    /**
+     * 税率
+     */
+    private BigDecimal taxRate;
+
+    /**
+     * 市场价格
+     */
+    private BigDecimal marketPrice;
+
+    /**
+     * 会员价格
+     */
+    private BigDecimal memberPrice;
+
+    /**
+     * 采购价格
+     */
+    private BigDecimal purchasingPrice;
+
+    /**
+     * 最高采购价格
+     */
+    private BigDecimal maxPurchasePrice;
+
     /**
      * 最小起订量
      */

+ 3 - 3
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/vo/OrderMainVo.java

@@ -165,21 +165,21 @@ public class OrderMainVo implements Serializable {
      */
     @ExcelProperty(value = "运费", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "元=")
-    private Long shippingFee;
+    private BigDecimal shippingFee;
 
     /**
      * 订单总金额(元)
      */
     @ExcelProperty(value = "订单总金额", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "元=")
-    private Long totalAmount;
+    private BigDecimal totalAmount;
 
     /**
      * 应付金额(元)
      */
     @ExcelProperty(value = "应付金额", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "元=")
-    private Long payableAmount;
+    private BigDecimal payableAmount;
 
     /**
      * 支付状态

+ 25 - 0
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/vo/OrderProductVo.java

@@ -102,6 +102,31 @@ public class OrderProductVo implements Serializable {
     @ExcelDictFormat(readConverterExp = "元=")
     private BigDecimal platformPrice;
 
+    /**
+     * 税率
+     */
+    private BigDecimal taxRate;
+
+    /**
+     * 市场价格
+     */
+    private BigDecimal marketPrice;
+
+    /**
+     * 会员价格
+     */
+    private BigDecimal memberPrice;
+
+    /**
+     * 采购价格
+     */
+    private BigDecimal purchasingPrice;
+
+    /**
+     * 最高采购价格
+     */
+    private BigDecimal maxPurchasePrice;
+
     /**
      * 最小起订量
      */