From 386126cb5e70d2fe3915afb892a4a642695c4d0e Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 26 Sep 2024 15:14:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=20=E7=BB=9F=E8=AE=A1=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1(=E5=8C=85=E6=8B=AC?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97)/=E9=94=80=E9=87=8F=E7=BB=9F=E8=AE=A1=20?=
 =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=20?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/ysk/cashier/vo/TbOrderPayCountVo.java  | 47 +++++++------------
 1 file changed, 16 insertions(+), 31 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderPayCountVo.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderPayCountVo.java
index d97fe1ea..1f275449 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderPayCountVo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderPayCountVo.java
@@ -1,44 +1,17 @@
 package cn.ysk.cashier.vo;
 
+import lombok.Data;
 
+@Data
 public class TbOrderPayCountVo {
     private String icon;
     private String payType;
     //是否展示金额标识
     private String isAmount="1";
     private Object payAmount;
+    private Object saveAmount;
 
-    public String getIcon() {
-        return icon;
-    }
-
-    public void setIcon(String icon) {
-        this.icon = icon;
-    }
-
-    public String getPayType() {
-        return payType;
-    }
-
-    public void setPayType(String payType) {
-        this.payType = payType;
-    }
-
-    public Object getPayAmount() {
-        return payAmount;
-    }
-
-    public void setPayAmount(Object payAmount) {
-        this.payAmount = payAmount;
-    }
-
-
-    public String getIsAmount() {
-        return isAmount;
-    }
-
-    public void setIsAmount(String isAmount) {
-        this.isAmount = isAmount;
+    public TbOrderPayCountVo() {
     }
 
     public TbOrderPayCountVo(String payType, Object payAmount) {
@@ -49,6 +22,18 @@ public class TbOrderPayCountVo {
         }
     }
 
+    public TbOrderPayCountVo(String payType, Object payAmount, Object saveAmount) {
+        this.payType = payType;
+        this.payAmount = payAmount;
+        this.saveAmount = saveAmount;
+        if (payAmount == null) {
+            this.payAmount = 0;
+        }
+        if (saveAmount == null) {
+            this.saveAmount = 0;
+        }
+    }
+
     public TbOrderPayCountVo(String icon, String payType, String isAmount, Object payAmount) {
         this.icon = icon;
         this.payType = payType;