commit 0b7de69bc644e7bfa7507f427278fb3f476eb30e
author zongqiang.zhang <zongqiang.zhang@supwisdom.com> 周二 12月 10 16:35:53 2019 +0800
committer zongqiang.zhang <zongqiang.zhang@supwisdom.com> 周二 12月 10 16:35:53 2019 +0800
tree c8255a51c592366d5e7279bcc2a62d1f34894970
parent b65f1248fe024cb0000957ceec8480aef60ba8ec

扫码按键停止出水

supwisdom/sp_consume.c

diff --git a/supwisdom/sp_consume.c b/supwisdom/sp_consume.c
index a141247..727b0d5 100644
--- a/supwisdom/sp_consume.c
+++ b/supwisdom/sp_consume.c
@@ -331,11 +331,11 @@
   /**
   **ÓÉÓÚÊÇÏȿ۷ѺóʹÓ㬷ÀÖ¹Ö»²å¿¨Ê±¿Û·Ñ
   **/
-  if(pos->purchase.used_num == 0)
+  /*if(pos->purchase.used_num == 0)
   {
     pos->purchase.paid_num = 0;
     pos->purchase.paid_sum = 0;
-  }
+  }*/
   ret = sp_prepare_below_transdtl(pos, card);
   if(ret)
   {
@@ -739,6 +739,7 @@
     cardWorkState->pause_tick = sp_get_ticker();
     break;
   case CARDWORKSTATUS_STOPPING:
+#if 0
     if(cardWorkState->last_state == CARDWORKSTATUS_NONE
         || cardWorkState->last_state == CARDWORKSTATUS_READY)
     {
@@ -760,6 +761,17 @@
     }
     cardWorkState->current_state = CARDWORKSTATUS_NONE;
     cardWorkState->last_state = cardWorkState->current_state;
+#endif
+
+    ret = do_stop(pos, &CARD);
+    if(ret)
+    {
+      cardWorkState->errcode = ret;
+      cardWorkState->current_state = CARDWORKSTATUS_ERROR;
+      break;
+    }
+    cardWorkState->current_state = CARDWORKSTATUS_NONE;
+    cardWorkState->last_state = cardWorkState->current_state;
     break;
   case CARDWORKSTATUS_ERROR:
     do_error(pos,cardWorkState->errcode);