commit d0017d711cbd75caf8814ae66791b958992898e6
author zongqiang.zhang <zongqiang.zhang@supwisdom.com> 周五 12月 06 09:26:32 2019 +0800
committer zongqiang.zhang <zongqiang.zhang@supwisdom.com> 周五 12月 06 09:26:40 2019 +0800
tree d65485f97410fde36ed5808d22dea60326791c1b
parent b7444f6e3088b8fdd8f3aa2a3c1ebbef362abdfe

优化

supwisdom/sp_communicate.c

diff --git a/supwisdom/sp_communicate.c b/supwisdom/sp_communicate.c
index 28dfe83..080a61d 100644
--- a/supwisdom/sp_communicate.c
+++ b/supwisdom/sp_communicate.c
@@ -98,8 +98,7 @@
   ret = sp_usart_recv(pos, &resp, COMM_WAIT_TIME);
   if(ret)
   {
-    ret = RC_CARD_AUTHENTICATION;
-    return ret;
+    return RC_CARD_AUTHENTICATION;
   }
 
   sp_unpack_init(&unpack,resp.data,resp.datalen);

supwisdom/sp_consume.c

diff --git a/supwisdom/sp_consume.c b/supwisdom/sp_consume.c
index d8e6bb1..cfa75b7 100644
--- a/supwisdom/sp_consume.c
+++ b/supwisdom/sp_consume.c
@@ -10,7 +10,6 @@
 #include "sp_consume.h"
 #include "sp_communicate.h"
 
-static uint32 count = 0;
 static uint8 menu_cnt = 0;
 static uint16 sp_calc_payamt_by_flowsensor(sp_pos_t* pos, sp_card_t* card)
 {
@@ -34,8 +33,6 @@
     return 0;
   }
   usedcount = sp_flowsensor_get_count()/pos->sysconf.flowsensor_unit;
-  //usedcount = count/pos->sysconf.flowsensor_unit;
-  count++;
   if(usedcount < pos->purchase.paid_num)
   {
     //ûÓдﵽ¿Û·ÑÁ÷Á¿
@@ -178,23 +175,6 @@
   return 0;
 }
 
-static uint16 sp_card_valid_check(const sp_card_t* card)
-{
-  uint8 ctime[6];
-  /*
-  if(card->cardno < 1)
-  {
-    return RC_CARDNO_EXCEPT;
-  }
-  */
-  sp_get_bcdtime(ctime);
-  if(memcmp(card->expiredate +1, ctime, 3) < 0)
-  {
-    return RC_CARD_EXPIRED;
-  }
-  return 0;
-}
-
 static uint16 sp_check_dev(const sp_pos_t* pos)
 {
   uint16 ret;
@@ -238,8 +218,7 @@
   ret = sp_card_read(card);
   if(ret)
   {
-    ret = RC_CARD_INVALID;
-    return ret;
+    return RC_CARD_INVALID;
   }
   if(pos->load_para_status)
   {
@@ -256,16 +235,10 @@
     return ret;
   }
 
-  ret = sp_card_valid_check(card);
-  if(ret)
-  {
-    return ret;
-  }
   ret = sp_card_authentication(pos, card);
   if(ret)
   {
-    ret = RC_CARD_AUTHENTICATION;
-    return ret;
+    return RC_CARD_AUTHENTICATION;
   }
   ret = sp_prepare_behalf_transdtl(pos, card, &record);
   if(ret)
@@ -290,7 +263,6 @@
 static uint16 do_work(sp_pos_t* pos, sp_card_t* card)
 {
   uint16 ret;
-  sp_valve_on();
   //¼ÆËãÏû·Ñ½ð¶î
   ret = sp_calc_payamt_by_flowsensor(pos, card);
   if(ret)
@@ -335,7 +307,6 @@
   }
   pos->paymode = PAYMODE_INIT;
   pos->sysconf.work_mode = 0;
-  count = 0;
   MEMCLEAR(&pos->purchase, sizeof(sp_purchase_t));
   MEMCLEAR(card, sizeof(sp_card_t));
   return 0;
@@ -364,7 +335,6 @@
     show_error(pos,"²Ù×÷ʧ°Ü:",errcode);
     pos->paymode = PAYMODE_INIT;
     pos->sysconf.work_mode = 0;
-    count = 0;
     MEMCLEAR(&pos->purchase, sizeof(sp_purchase_t));
   }
 }

supwisdom/sp_data.c

diff --git a/supwisdom/sp_data.c b/supwisdom/sp_data.c
index b076c14..d8d40a7 100644
--- a/supwisdom/sp_data.c
+++ b/supwisdom/sp_data.c
@@ -75,7 +75,6 @@
 //Ïû·Ñ³õʼ»¯ºó´æ´¢Éϰ벿·ÖÁ÷Ë®£¬·ÀÖ¹Ïû·Ñʧ°ÜÎÞÁ÷Ë®ÐÅÏ¢
 uint16 sp_prepare_behalf_transdtl(sp_pos_t* pos, sp_card_t* card, sp_transdtl_t* record)
 {
-  uint8 ret = 0;
   uint8 ctime[6];
   MEMCLEAR(ctime, sizeof(ctime));
 
@@ -93,9 +92,7 @@
   {
     record->transway = 1;
   }
-  ret = sp_write_behalf_record(pos, record);
-  if(ret)
-    return ret;
+  sp_write_behalf_record(pos, record);
   return sp_write_last_record(pos);
 }