1. 实现终止非码支付和退款任务。

fmvip/task/fmtask.cpp

@@ -61,7 +61,7 @@ void FMTask::stopTask()
     }
     if(_window != nullptr) {
         _window->reject();
-        FMMsgWnd::WarningWnd(QString::fromLocal8Bit("通讯中断，交易终止"), _window);
+        FMMsgWnd::WarningWnd(QString::fromLocal8Bit("通讯中断，交易取消"), _window);
         _window = nullptr;
     }
 

fmvip/task/taskqrpay.cpp

-#include "taskqrpay.h"
+#include "taskqrpay.h"
 #include "items/order.h"
 #include "items/pay.h"
 #include "items/storeinfo.h"
@@ -69,3 +69,9 @@ void TaskQRPay::packagePOSRsp()
 {
 
 }
+
+void TaskQRPay::stopTask()
+{
+    FMMsgWnd::WarningWnd(QString::fromLocal8Bit("通讯中断，交易取消"));
+    _epay->StopService();
+}

fmvip/task/taskqrpay.h

@@ -13,6 +13,8 @@ public:
     void packagePOSReq();
     void packagePOSRsp();
 
+    void stopTask();
+
 private:
     FMPePayInterface *_epay;
 };

fmvip/task/taskqrrefund.cpp

-#include "taskqrrefund.h"
+#include "taskqrrefund.h"
 #include "items/order.h"
 #include "items/pay.h"
 #include "items/storeinfo.h"
@@ -53,3 +53,9 @@ void TaskQRRefund::packagePOSRsp()
 {
 
 }
+
+void TaskQRRefund::stopTask()
+{
+    FMMsgWnd::WarningWnd(QString::fromLocal8Bit("通讯中断，交易取消"));
+    _epay->StopService();
+}

fmvip/task/taskqrrefund.h

@@ -13,6 +13,8 @@ public:
     void packagePOSReq();
     void packagePOSRsp();
 
+    void stopTask();
+
 private:
     FMPePayInterface *_epay;
 };

version.h

@@ -5,7 +5,7 @@
 #define VER_MINOR 1
 #define VER_REVISION 0
 
-#define VER_BUILD 34
+#define VER_BUILD 35
 
 //! Convert version numbers to string
 #define _STR(S)  #S