1. 从配置文件中读取OLTP的dll中的各个参数。 2. 修复签名时OLTP参数错误。 3. 使用SPCC密钥。

sbkpay/DataProcess/fmglobal.h

@@ -11,7 +11,7 @@
 #define CFG_FILE_NAME				"fmclient.cfg"
 #define RBG_FILE_NAME				"fmclient.rbk"
 
-#define DES3_KEY					"ABCD@#9876DFSAAWKLDEOPDD"
+#define DES3_KEY					"DDDDEEEE45LPODDCXZZLKDDO"
 #define DES3_KEY_PRT				"1JG23G12Y12V123G123F1DI1"
 #define CRET_FILE_NAME				"client.p12"
 #define JSON_KEY_ONLY				"partnerOrderId"

sbkpay/control.cpp

@@ -26,7 +26,7 @@
 
 EXTERN_C IMAGE_DOS_HEADER __ImageBase;
 
-typedef int (__stdcall *SKBAPISend)(const char *indata, const char *guid, char *outdata, char *errMsg, const char *mode);
+typedef int (__stdcall *SKBAPISend)(const char *indata, const char *guid, char *outdata, char *errMsg, const char *mode, const char *operation);
 
 Control::Control(QObject *parent) : QObject(parent), _widget(NULL)
 {
@@ -309,18 +309,18 @@ bool Control::SendMessageToSBKAPI(const QJsonObject &json, QByteArray &outdata,
                 QString reqXmlStr = QString::fromLocal8Bit("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
                                                              "<ns0:OLTP xmlns:ns0=\"http://spcc.com.cn/online\">"
                                                                  "<ns0:HEADER>"
-                                                                    "<ns0:VER>01.01</ns0:VER>"
-                                                                 "<ns0:FROM>CS00000001</ns0:FROM>"
-                                                                    "<ns0:TERMINO>%1</ns0:TERMINO>"
-                                                                    "<ns0:TO>%2</ns0:TO>"
-                                                                    "<ns0:BUSINESS>0000000</ns0:BUSINESS>"
-                                                                    "<ns0:DATE>%3</ns0:DATE>"
-                                                                    "<ns0:TIME>%4</ns0:TIME>"
-                                                                    "<ns0:STATCODE>0000</ns0:STATCODE>"
+                                                                    "<ns0:VER>%1</ns0:VER>"
+                                                                 "<ns0:FROM>%2</ns0:FROM>"
+                                                                    "<ns0:TERMINO>%3</ns0:TERMINO>"
+                                                                    "<ns0:TO>%4</ns0:TO>"
+                                                                    "<ns0:BUSINESS>%5</ns0:BUSINESS>"
+                                                                    "<ns0:DATE>%6</ns0:DATE>"
+                                                                    "<ns0:TIME>%7</ns0:TIME>"
+                                                                    "<ns0:STATCODE>%8</ns0:STATCODE>"
                                                                     "<ns0:STATDESC/>"
                                                                 "</ns0:HEADER>"
                                                                 "<ns0:AP>"
-                                                                    "%5"
+                                                                    "%9"
                                                                 "</ns0:AP>"
                                                             "</ns0:OLTP>");
                 QString nsTo = "CS00400004";
@@ -338,16 +338,25 @@ bool Control::SendMessageToSBKAPI(const QJsonObject &json, QByteArray &outdata,
 
                 QByteArray jsonArray = QJsonDocument(json).toJson(QJsonDocument::Compact);
 
-                reqXmlStr = reqXmlStr.arg(termino).arg(nsTo).arg(QDate::currentDate().toString("yyyyMMdd")).arg(time).arg(QString::fromUtf8(jsonArray));
+                reqXmlStr = reqXmlStr.arg(_setting.GetValue(CONFIG_OLTP_VER, "01.01").toString())
+                        .arg(_setting.GetValue(CONFIG_OLTP_FROM, "CS00000001").toString())
+                        .arg(termino)
+                        .arg(nsTo)
+                        .arg(_setting.GetValue(CONFIG_OLTP_BUSINESS, "0000000").toString())
+                        .arg(QDate::currentDate().toString("yyyyMMdd"))
+                        .arg(time)
+                        .arg(_setting.GetValue(CONFIG_OLTP_STATCODE, "0000").toString())
+                        .arg(QString::fromUtf8(jsonArray));
 
                 char in[MAX_BUF_LEN] = {0};
                 char out[MAX_BUF_LEN] = {0};
                 char *guid = "";
                 char errMsg[MAX_BUF_LEN] = {0};
-                char *mode = "ONLINE";
+                QByteArray mode = _setting.GetValue(CONFIG_OLTP_MODE, "FM").toByteArray();
+                QByteArray operation = _setting.GetValue(CONFIG_OLTP_OPERATION, "75000").toByteArray();
 
                 strcpy(in, reqXmlStr.toUtf8().data());
-                QLOG_INFO() << "Request StarbucksAPI XML data: " << in;
+                QLOG_INFO() << "Request StarbucksAPI XML data: " << in << "mode: " << mode << "Operation: " << operation;
 #ifdef MOCK
                 QLOG_DEBUG() << "=========================================== Read debug data. ========================================";
                 QLOG_DEBUG() << "Test req type: " << type;
@@ -359,7 +368,7 @@ bool Control::SendMessageToSBKAPI(const QJsonObject &json, QByteArray &outdata,
 
                 int result = 0;
 #else
-                int result = skbSend(in, guid, out, errMsg, mode);
+                int result = skbSend(in, guid, out, errMsg, mode.data(), operation.data());
 #endif //! End def MOCK
 
                 QLOG_DEBUG() << "StarbucksAPI return to GBK: " << QString::fromLocal8Bit(out);
@@ -430,10 +439,10 @@ bool Control::GetRSA(QString &error)
     QJsonObject json;
 
     json.insert(JSON_KEY_VER, 1);
-    json.insert(JSON_KEY_REQTYPE, 99);
+    json.insert(JSON_KEY_REQTYPE, sign);
     json.insert(JSON_KEY_STOREID, FMTool::GetJsonValue(_posReqJsonObj, JSON_KEY_STOREID).toString());
     json.insert(JSON_KEY_STATIONID, FMTool::GetJsonValue(_posReqJsonObj, JSON_KEY_STATIONID).toString());
-    json.insert(JSON_KEY_PARTNERID, QString::number(FMTool::GetJsonValue(_posReqJsonObj, JSON_KEY_PARTNERID).toInt()));
+    json.insert(JSON_KEY_PARTNERID, FMTool::GetJsonValue(_posReqJsonObj, JSON_KEY_PARTNERID).toInt());
 
     CretOperate::GetDES3MAC(json);
     QByteArray array;

sbkpay/control.h

@@ -4,6 +4,7 @@
 #include "requestmodel.h"
 #include "hostwidget.h"
 #include "DataProcess/fmp_database.h"
+#include "fmp_settings.h"
 #include <QObject>
 #include <QApplication>
 #include <QLibrary>
@@ -75,6 +76,7 @@ private:
     bool _isinterrupt;
 
     FMPDataBase *_db;
+    FMPSettings _setting;
 
     POSType _posType;
 };

sbkpay/global.h

@@ -88,5 +88,14 @@
 #define JSON_REQTYPE_PRINTER            85
 #define JSON_REQTYPE_FIND               2
 
+
+#define CONFIG_OLTP_PATH               "OLTP/DLLPATH"
+#define CONFIG_OLTP_VER                "OLTP/VER"
+#define CONFIG_OLTP_FROM               "OLTP/FROM"
+#define CONFIG_OLTP_BUSINESS           "OLTP/BUSINESS"
+#define CONFIG_OLTP_STATCODE           "OLTP/STATCODE"
+#define CONFIG_OLTP_MODE               "OLTP/MODE"
+#define CONFIG_OLTP_OPERATION          "OLTP/OPERATION"
+
 #endif // GLOBAL
 

sbkpay/hostwidget.cpp

@@ -35,7 +35,7 @@ HostWidget::HostWidget(QWidget *parent) :
     connect(&_intertime, &QTimer::timeout, this, [this](){
         if(!_need_exit)
         {
-            ui->btn_pay_exitint->show();
+//            ui->btn_pay_exitint->show();
         }
     });
 

sbkpay/main.cpp

@@ -31,7 +31,7 @@ static bool CopyApiDll(QString &errorString)
     QFileInfo localFileInfo(localDllPath);
 
     FMPSettings setting;
-    QString configDllPath = setting.GetValue("STARBUCKSAPIURL", ".").toString();
+    QString configDllPath = setting.GetValue(CONFIG_OLTP_PATH, "C:\\OLTP\\").toString();
     QFileInfo configFileInfo(configDllPath);
 
     if(!configFileInfo.isFile()) {
@@ -415,7 +415,7 @@ int main(int argc, char *argv[])
 
 //    control.Start(as, b);
 
-    char spccIn[MAX_BUF_LEN] = "{\"fmId\":\"0123456789012345678\",\"reqType\":451,\"storeId\":\"1713\",\"stationId\":\"1\",\"partnerId\":1443,\"operatorId\":\"sssaw\",\"transId\":\"52342342323806\",\"transAmount\":8000,\"partnerOrderId\":\"909911039993720192019\",\"businessDate\":\"20170508\",\"products\":[{\"pid\":\"123\",\"name\":\"中杯拿铁\",\"price\":321,\"salesType\":\"NORMAL\"}]}";
+    char spccIn[MAX_BUF_LEN] = "{\"fmId\":\"0123456789012345678\",\"reqType\":352,\"storeId\":\"1713\",\"stationId\":\"1\",\"partnerId\":1443,\"operatorId\":\"sssaw\",\"transId\":\"52342342323806\",\"transAmount\":8000,\"partnerOrderId\":\"909911039993720192019\",\"businessDate\":\"20170508\",\"products\":[{\"pid\":\"123\",\"name\":\"中杯拿铁\",\"price\":321,\"salesType\":\"NORMAL\"}]}";
     control.Start(spccIn, b);
 
     return a.exec();