commit 60427fc04dd9bfdcb205322f06e6ad9f39c7ec62
author zongqiang.zhang <zongqiang.zhang@supwisdom.com> 周一 8月 03 18:16:14 2020 +0800
committer zongqiang.zhang <zongqiang.zhang@supwisdom.com> 周一 8月 03 18:16:14 2020 +0800
tree 082b9abd30bd8026756c792b1cbf3a03c40f9fec
parent 4fef97f485fbfcb2fef4eba98c16bfd655770be1

消费金额按厘计算

supwisdom/sp_config.h

diff --git a/supwisdom/sp_config.h b/supwisdom/sp_config.h
index 1119d28..60065ad 100644
--- a/supwisdom/sp_config.h
+++ b/supwisdom/sp_config.h
@@ -103,13 +103,14 @@
   uint8 transtime[3];
   uint32 cobillno;		//½»Ò׶©µ¥±àºÅ
   uint8 cardphyid[4];	//¿¨ÎïÀíid
+  uint8 cardno[4]; //ÊÐÃñ¿¨ºÅ
   uint8 transway;		//½»Ò×·½Ê½£¬0-³õʼ£¬1-Ë¢¿¨£¬2-ɨÂë
-  uint8 amount;			//ʵ¼ÊÖ§¸¶½ð¶î
-  uint8 paidAmount;		//ÒÑÖ§¸¶½ð¶î£¬µ±ÊÇÏÈ¿Û·ÑģʽÏ£¬¼Ç¼ÒÑÖ§¸¶µÄ½ð¶î
-  uint8 flowsensors;	//ʵ¼ÊʹÓüÆÁ¿£¨µ¥Î»£º°ÙºÁÉý£©
+  uint32 amount;			//ʵ¼ÊÖ§¸¶½ð¶î
+  uint32 paidAmount;		//ÒÑÖ§¸¶½ð¶î£¬µ±ÊÇÏÈ¿Û·ÑģʽÏ£¬¼Ç¼ÒÑÖ§¸¶µÄ½ð¶î
+  uint32 flowsensors;	//ʵ¼ÊʹÓüÆÁ¿£¨µ¥Î»£º°ÙºÁÉý£©
   uint8 transtatus;		//Á÷ˮ״̬£¬0-³õʼ£¬1-³É¹¦£¬2-ʧ°Ü
-  uint8 reverse[7];		//ռλ·û
-  uint8 crc[2]; 		//len=32
+  uint8 unused[26];		//ռλ·û
+  uint8 crc[2]; 		//len=64
 } sp_transdtl_t;
 
 typedef struct
@@ -144,12 +145,12 @@
 
   uint8 starttime[6];  	//Ë¢¿¨Ê±¼ä
   /*ÏÈ¿Û¿îºó³öË®*/
-  uint16 prepaid_num;	//µ¥´Î¿ÉÓüÆÁ¿(µ¥Î»:100ml)
-  uint16 prepaid_amt;	//µ¥´ÎÔ¤¸¶½ðÇ®
+  uint32 prepaid_num;	//µ¥´Î¿ÉÓüÆÁ¿(µ¥Î»:100ml)
+  uint32 prepaid_amt;	//µ¥´ÎÔ¤¸¶½ðÇ®(µ¥Î»:Àå)
 
-  uint16 paid_num; 		//ÀۼƿÉÓüÆÁ¿(µ¥Î»:100ml)
-  uint16 paid_sum;  	//ÀÛ¼ÆÖ§¸¶½ð¶î
-  uint16 used_num; 		//ÒÑʹÓüÆÁ¿(µ¥Î»:100ml)
+  uint32 paid_num; 		//ÀۼƿÉÓüÆÁ¿(µ¥Î»:100ml)
+  uint32 paid_sum;  	//ÀÛ¼ÆÖ§¸¶½ð¶î(µ¥Î»:Àå)
+  uint32 used_num; 		//ÒÑʹÓüÆÁ¿(µ¥Î»:100ml)
 } sp_purchase_t;
 
 //¶þάÂëÐÅÏ¢
@@ -162,7 +163,7 @@
   uint32 waittime;		//³öË®µÈ´ýʱ¼ä
   uint8 authstatus;		//Óû§È·ÈÏ״̬£¨0-δȷÈÏ£¬1-ÒÑÈ·ÈÏ£©
   uint8 paystatus;		//Ö§¸¶×´Ì¬£¨0-´ýÖ§¸¶£¬ 1-ÒÑÖ§¸¶£¬ 2-´ú¿Û£¬3 - ¹Ø±Õ£©
-  uint8 paidAmount;		//µ±¶©µ¥ÊÇÒÑÖ§¸¶×´Ì¬£¬·µ»ØÖ§¸¶³É¹¦½ð¶î £¬ ·ñÔòÊÇ 0
+  uint32 paidAmount;		//µ±¶©µ¥ÊÇÒÑÖ§¸¶×´Ì¬£¬·µ»ØÖ§¸¶³É¹¦½ð¶î £¬ ·ñÔòÊÇ 0
 } sp_qrcode_t;
 
 //É豸²ÎÊý
@@ -224,19 +225,19 @@
 {
   uint8 fee_start;	//T°ÙºÁÉý¿ªÊ¼;
   uint8 fee_unit;	//µ¥´Î¿Û·Ñ¿ÉÓÃÁ÷Á¿£¨µ¥Î»:100ml£©
-  uint8 fee_amt;	//µ¥´Î¿Û·Ñ½ð¶î£¬ÒÔ·ÖΪµ¥Î»
+  uint8 fee_amt;	//µ¥´Î¿Û·Ñ½ð¶î£¬ÒÔÀåΪµ¥Î»
 } sp_feepara_t;
 
 //¿¨½á¹¹ÐÅÏ¢
 typedef struct
 {
   uint8 cardphyid[4];
-  uint8 citizen_cardno[12];	//ÊÐÃñºÅ
+  uint8 citizen_cardno[4];	//ÊÐÃñºÅ
   uint8 cardtype;
   uint8 expiredate[4];
 
-  uint16 waterlimit;		//µ¥´Î³öË®Á÷Á¿ÉÏÏÞ£¨100ml£©
-  uint16 amountlimit;		//µ¥´Î³öË®½ð¶îÉÏÏÞ (·Ö)
+  uint32 waterlimit;		//µ¥´Î³öË®Á÷Á¿ÉÏÏÞ£¨100ml£©
+  uint32 amountlimit;		//µ¥´Î³öË®½ð¶îÉÏÏÞ (Àå)
   uint32 cobillno;		//½»Ò׶©µ¥±àºÅ
   uint8	permit;			//ÊÇ·ñÔÊÐíÏû·Ñ£¬0-ÔÊÐí£¬1-²»ÔÊÐí
   char limitmsg[45];		//ÏÞÖÆÏû·ÑÐÅÏ¢