1. 修复非码支付和退款金额错误Bug。 2. 修改数据库文件名。

fmvip/db/database.h

@@ -12,6 +12,12 @@
 #include "item.h"
 #include <QDebug>
 
+#if defined(FM_TEST)
+#define DBFileName  "Test.db"
+#else
+#define DBFileName  "FreemudPOS.db"
+#endif
+
 #if defined(DATABASE_MYSQL)
 #  include <odb/mysql/database.hxx>
 #elif defined(DATABASE_SQLITE)
@@ -142,7 +148,7 @@ public:
 
 private:
     DBConnect() :
-        _dbName("Test.db")
+        _dbName(DBFileName)
     {
         _db_pointer = std::make_shared<odb::sqlite::database>(_dbName, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE);
         OpenDatabase();

fmvip/task/taskqrpay.cpp

@@ -60,7 +60,9 @@ void TaskQRPay::packagePOSReq()
                 setError(FM_API_ERROR, info);
                 return;
             }
-            _order->setOrderAmount(getPosJsonValue(PosProps.OrderAmount).toInt());
+
+            //! 目前接口中支付时OrderAmount可能和会员的不同，暂时不修改订单金额。
+//            _order->setOrderAmount(getPosJsonValue(PosProps.OrderAmount).toInt());
             _order->setUndisAmount(getPosJsonValue(PosProps.UndisAmount).toInt());
 
             QJsonArray productArray = getPosJsonValue(PosProps.Products).toArray();

fmvip/task/taskqrrefund.cpp

@@ -47,7 +47,7 @@ void TaskQRRefund::packagePOSReq()
         LazyPayList pays = _order->payList();
         foreach (auto payLazyPointer, pays) {
             //! WARNING: 临时的找第三方支付的方法
-            if(payLazyPointer.load()->transId() != orderId) {
+            if(payLazyPointer.load()->thirdTransId()!="") {
                 refundPay = payLazyPointer.getEager();
                 break;
             }

fmvip/windows/forms/fmviporder.ui

@@ -1073,6 +1073,17 @@ font: 13px "微软雅黑";
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
+ <tabstops>
+  <tabstop>pay_edit</tabstop>
+  <tabstop>pay_btn</tabstop>
+  <tabstop>coupon_page</tabstop>
+  <tabstop>coupon_prev_btn</tabstop>
+  <tabstop>coupon_next_btn</tabstop>
+  <tabstop>close_btn</tabstop>
+  <tabstop>pay_key</tabstop>
+  <tabstop>score_edit</tabstop>
+  <tabstop>score_key</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>

version.h

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