commit 0b456a3ee8a69a8bc3325ddb5df50b27e96ec5b5
author guangcheng.qin <guangcheng.qin@supwisdom.com> 周四 8月 08 16:53:12 2019 +0800
committer guangcheng.qin <guangcheng.qin@supwisdom.com> 周四 8月 08 16:53:12 2019 +0800
tree 72db98678db9a5dca62618a21aa0bc74a3a56ead
parent 55f3fa69599ff0c6c4860c88c8be878af4b9cb85

添加读取市民卡号和卡有效期

supwisdom/sp_consume.c

diff --git a/supwisdom/sp_consume.c b/supwisdom/sp_consume.c
index 587e2a4..703c00c 100644
--- a/supwisdom/sp_consume.c
+++ b/supwisdom/sp_consume.c
@@ -240,12 +240,6 @@
     ret = RC_CARD_INVALID;
     return ret;
   }
-  ret = sp_card_authentication(pos, card);
-  if(ret)
-  {
-    ret = RC_CARD_AUTHENTICATION;
-    return ret;
-  }
   if(pos->load_para_status)
   {
     return pos->load_para_status;
@@ -266,6 +260,12 @@
   {
     return ret;
   }
+  ret = sp_card_authentication(pos, card);
+  if(ret)
+  {
+    ret = RC_CARD_AUTHENTICATION;
+    return ret;
+  }
   ret = sp_prepare_behalf_transdtl(pos, card, &record);
   if(ret)
   {
@@ -590,30 +590,31 @@
   uint8 keycode = SP_KEY_NONE;
   keycode = sp_get_key();
   //ÔÚ¿¨Ïû·ÑÔÝÍ£Çé¿öÏ°´ÈÎÒâ¼üΪ½áÊøµ±Ç°Ïû·Ñ״̬
-  if(keycode >= SP_KEY_0 && keycode <= SP_KEY_ENTER && pos->cardState.cur_state == STATE_NONE
+  if(keycode >= SP_KEY_0 && keycode <= SP_KEY_ENTER
+      && pos->cardState.cur_state == STATE_NONE
       && cardWorkState->current_state == CARDWORKSTATUS_PAUSE && pos->paymode == PAYMODE_CARD)
   {
-  	cardWorkState->current_state = CARDWORKSTATUS_STOPPING;
-	return;
+    cardWorkState->current_state = CARDWORKSTATUS_STOPPING;
+    return;
   }
   //Ïû·Ñģʽ³õʼ»¯×´Ì¬Ï°´È·ÈϼüÑ¡Ôñ¶þάÂëÏû·Ñ
   if((keycode == SP_KEY_ENTER) && (pos->paymode == PAYMODE_INIT))
   {
     cardWorkState->current_state = CARDWORKSTATUS_NONE;
     pos->paymode = PAYMODE_QRCODE;
-	return;
+    return;
   }
   //¶þάÂëģʽÏ°´È¡Ïû¼üΪֹͣ¹¤×÷
   if((pos->paymode == PAYMODE_QRCODE) && (keycode == SP_KEY_CLEAR))
   {
     cardWorkState->current_state = CARDWORKSTATUS_STOPPING;
-	return;
+    return;
   }
   //°´0¼ü½øÈëÉ豸²Ù×÷½çÃæ
   if(keycode == SP_KEY_0 && (pos->paymode == PAYMODE_INIT))
   {
     cardWorkState->current_state = CARDWORKSTATUS_SET_DEV;
-	return;
+    return;
   }
 }