From 85aaa9abe1b0fe8e99b0c09356b7329ed0c1cd8b Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 30 五月 2024 09:46:14 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd83CloseVo.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd83CloseVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd83CloseVo.java
index f9e22d0..89c4ac0 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd83CloseVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd83CloseVo.java
@@ -17,6 +17,9 @@
     public Double thisAmount ;//鐢ㄦ按鎴锋湰娆$敤姘撮噺锛氱疮璁℃祦閲�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
     public Double thisMoney ;//鐢ㄦ按鎴锋湰娆℃秷璐归噾棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
     public Integer thisTime ;//鐢ㄦ按鎴锋湰娆$敤姘存椂闀匡細鐢ㄦ按鏃堕暱2瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999锛屽崟浣嶄负鍒嗛挓銆�
+    public Byte priceType ;//姘翠环绫诲瀷锛�1锛氭按鍗℃按浠凤紝2锛氭帶鍒跺櫒姘翠环锛�
+    public Double price ;//姘翠环
+    public Byte cardType ;//鍗$被鍨�
     public String rtuDt ;//鎺у埗鍣ㄦ椂閽�
 
     public String toString(){
@@ -52,6 +55,15 @@
         sb.append("      鏈鐢ㄦ按鏃堕暱锛堝垎閽燂級锛�");
         sb.append(thisTime==null?"":thisTime);
         sb.append("\n");
+        sb.append("      姘翠环绫诲瀷锛�");
+        sb.append(priceType ==null?"": (priceType==1?"IC鍗℃按浠�":(priceType==2?"鎺у埗鍣ㄦ按浠�":"鏈煡")));
+        sb.append("\n");
+        sb.append("      姘翠环锛�");
+        sb.append(price ==null?"": price);
+        sb.append("\n");
+        sb.append("      鍗$被鍨嬶細");
+        sb.append(cardType==null?"鏈煡":CommonV1_0_1.icCardType(cardType)) ;
+        sb.append("\n");
         sb.append("      鎺у埗鍣ㄦ椂閽燂細");
         sb.append(rtuDt==null?"":rtuDt);
         sb.append("\n");

--
Gitblit v1.8.0