From d6b05d4ff19ef53f45d5c7b5e1d118a65464e8d3 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Mon, 9 Aug 2021 09:32:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=87=91=E9=A2=9D=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=85=A8=E9=83=A8=E9=99=90=E5=88=B6=E5=A4=A7=E4=BA=8E?=
 =?UTF-8?q?0=EF=BC=8C=E4=BB=A5=E9=98=B2=E6=AD=A2=E8=B4=9F=E6=95=B0?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/entity/dto/PriceDetailDTO.java      | 98 ++++++++++++++++++-
 1 file changed, 97 insertions(+), 1 deletion(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/PriceDetailDTO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/PriceDetailDTO.java
index cd174948..ad3eeadc 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/PriceDetailDTO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/PriceDetailDTO.java
@@ -19,6 +19,8 @@ import java.util.List;
 @Data
 public class PriceDetailDTO implements Serializable {
 
+
+    private static final long serialVersionUID = 8808470688518188146L;
     /**
      * 订单原始总价格
      * 用于订单价格修改金额计算使用
@@ -26,7 +28,6 @@ public class PriceDetailDTO implements Serializable {
     @ApiModelProperty(value = "订单原始总价格")
     private Double originalPrice;
 
-    private static final long serialVersionUID = 8808470688518188146L;
     @ApiModelProperty(value = "商品总金额（商品原价）")
     private Double goodsPrice;
 
@@ -102,11 +103,13 @@ public class PriceDetailDTO implements Serializable {
     }
 
     public PriceDetailDTO() {
+        originalPrice=0d;
         goodsPrice = 0d;
         freightPrice = 0d;
 
         payPoint = 0;
         discountPrice = 0d;
+        couponPrice=0d;
 
         distributionCommission = 0d;
         platFormCommission = 0d;
@@ -119,6 +122,8 @@ public class PriceDetailDTO implements Serializable {
 
         flowPrice = 0d;
         billPrice = 0d;
+        settlementPrice=0d;
+
 
         joinPromotion = new ArrayList<>();
     }
@@ -245,4 +250,95 @@ public class PriceDetailDTO implements Serializable {
         return goodsPrice;
     }
 
+    public Double getGoodsPrice() {
+        if (goodsPrice <= 0) {
+            return 0D;
+        }
+        return goodsPrice;
+    }
+
+    public Double getFreightPrice() {
+        if (freightPrice <= 0) {
+            return 0D;
+        }
+        return freightPrice;
+    }
+
+    public Integer getPayPoint() {
+        if (payPoint <= 0) {
+            return 0;
+        }
+        return payPoint;
+    }
+
+    public Double getDiscountPrice() {
+        if (discountPrice <= 0) {
+            return 0D;
+        }
+        return discountPrice;
+    }
+
+    public Double getCouponPrice() {
+        if (couponPrice <= 0) {
+            return 0D;
+        }
+        return couponPrice;
+    }
+
+    public Double getDistributionCommission() {
+        if (distributionCommission <= 0) {
+            return 0D;
+        }
+        return distributionCommission;
+    }
+
+    public Double getPlatFormCommission() {
+        if (platFormCommission <= 0) {
+            return 0D;
+        }
+        return platFormCommission;
+    }
+
+    public Double getSiteCouponPrice() {
+        if (siteCouponPrice <= 0) {
+            return 0D;
+        }
+        return siteCouponPrice;
+    }
+
+    public Double getSiteCouponPoint() {
+        if (siteCouponPoint <= 0) {
+            return 0D;
+        }
+        return siteCouponPoint;
+    }
+
+    public Double getSiteCouponCommission() {
+        if (siteCouponCommission <= 0) {
+            return 0D;
+        }
+        return siteCouponCommission;
+    }
+
+
+    public Double getFlowPrice() {
+        if (flowPrice <= 0) {
+            return 0D;
+        }
+        return flowPrice;
+    }
+
+    public Double getSettlementPrice() {
+        if (settlementPrice <= 0) {
+            return 0D;
+        }
+        return settlementPrice;
+    }
+
+    public Double getBillPrice() {
+        if (billPrice <= 0) {
+            return 0D;
+        }
+        return billPrice;
+    }
 }