From 70cd3733e8d72a6bbcfcbfa78f8eecbdec7ee8f9 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 06 六月 2024 15:51:42 +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 | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 da14235..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
@@ -9,14 +9,17 @@
// 6銆佹祦閲忚鏁呴殰鍏抽榾锛�7銆佺揣鎬ュ叧闃�锛�8銆佺敤鎴疯繙绋嬪紑闃�锛�9銆佺敤鎴疯繙绋嬪叧闃�锛�
public Byte type ;
public Double totalAmount; //绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
- public String cardNo ;//IC鍗＄紪鍙�
- public String icAddr ;//ic鍗″湴鍧�
+ public String icCardNo;//IC鍗＄紪鍙�
+ public String icCardAddr;//ic鍗″湴鍧�
public Double remainMoney ;//鍓╀綑閲戦锛氱敤鎴蜂綑棰�4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏�
public String openDt ;//鐢ㄦ按鎴风敤姘村紑濮嬫椂闂达細6瀛楄妭BCD鐮侊紝椤哄簭鏄勾鏈堟棩鏃跺垎绉掞紝鍏朵腑鍏厓骞�=2000+骞淬��
public String closeDt ;//鐢ㄦ按鎴风敤姘寸粨鏉熸椂闂达細6瀛楄妭BCD鐮侊紝椤哄簭鏄勾鏈堟棩鏃跺垎绉掞紝鍏朵腑鍏厓骞�=2000+骞淬��
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(){
@@ -29,10 +32,10 @@
sb.append(totalAmount==null?"":totalAmount);
sb.append("\n");
sb.append(" IC鍗＄紪鍙凤細");
- sb.append(cardNo);
+ sb.append(icCardNo);
sb.append("\n");
sb.append(" ic鍗″湴鍧�锛�");
- sb.append(icAddr);
+ sb.append(icCardAddr);
sb.append("\n");
sb.append(" 鍓╀綑閲戦锛堝厓锛夛細");
sb.append(remainMoney ==null?"": remainMoney);
@@ -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