1.配置获取门店号等相关信息。2.增加https通讯

fmp_epay.cpp

@@ -7,9 +7,10 @@ class ctkPluginContext;
 
 FMPePay::FMPePay(ctkPluginContext *context)
     : FMPePayInterface(context),
-      _url(DEFAULT_EPAY_RWQUESTURL),
+      //_url(DEFAULT_EPAY_RWQUESTURL),
       _inited(false),
       //_needanimation(false),
+      _partner_id(QString("")),
       _databasename(DEFAULT_EPAY_DATABASENAME),
       _table(DEFAULT_EPAY_TABLE),
       _businessdate(QDateTime::currentDateTime().toString("yyyy-MM-dd")),

fmp_epay.h

@@ -38,6 +38,7 @@ private:
     QString             _store_id;
     QString             _station_id;
     QString             _operator_id;
+    QString             _partner_id;
 
 
     //销售单保存时间

fmp_epay_def.h

@@ -12,6 +12,7 @@
 #define FMP_EPAY_STATIONID              "station_id"
 #define FMP_EPAY_STOREID                "store_id"
 #define FMP_EPAY_TRANSID                "trans_id"
+#define FMP_EPAY_PARTNERID              "partnerId"
 #define FMP_EPAY_TRANSTRACTION          "transactions"
 #define FMP_EPAY_TRANSTRACTION_AMOUNT   "amount"
 #define FMP_EPAY_TRANSTRACTION_CODE     "code"

fmp_epay_p.cpp

@@ -13,6 +13,7 @@
 #include "fmp_database.h"
 #include "fmp_epay_checkmodel.h"
 
+#include <QSslCertificate>
 #include <QJsonParseError>
 #include <QJsonDocument>
 #include <QNetworkAccessManager>
@@ -140,11 +141,18 @@ void FMPePayPrivate::Init()
 
         _setting = q->GetService<FMPSettingsInterface>(q->_ctx);
 
+        q->_url = _setting->GetString(FMP_INIKEY_EPAYURL);
+        q->_store_id = _setting->GetString(FMP_INIKEY_LOGINSTOREID);
+        q->_station_id = _setting->GetString(FMP_INIKEY_LOGINPOSID);
+        q->_operator_id = _setting->GetString(FMP_INIKEY_LOGINCASHIER);
+        q->_partner_id = _setting->GetString(FMP_INIKEY_LOGINPARTNERID);
+
         hash[FMP_EPAY_ANIMATION] = _setting->GetBool(FMP_INIKEY_ANIMATION);
         hash[FMP_EPAY_BUSINESSDATE] = q->_businessdate;
         hash[FMP_EPAY_STOREID] = q->_store_id;
         hash[FMP_EPAY_STATIONID] = q->_station_id;
         hash[FMP_EPAY_OPERATORID] = q->_operator_id;
+        hash[FMP_EPAY_PARTNERID] = q->_partner_id;
 
         _payDialog = new FMPPayDialog(this, hash);
     }
@@ -273,9 +281,16 @@ bool FMPePayPrivate::HttpPost(QJsonObject& outjson, QJsonObject json, QString &e
     QEventLoop loop;
     QTimer timer;
 
+    QSslConfiguration config;
+    QList<QSslCertificate> certs = QSslCertificate::fromPath(qApp->applicationDirPath() + "/client01.pem");
+    config.setPeerVerifyMode(QSslSocket::VerifyNone);
+    config.setProtocol(QSsl::SslV3);
+    config.setCaCertificates(certs);
+
     QNetworkAccessManager manger;
     QNetworkRequest request(q->_url);
 
+    request.setSslConfiguration(config);
     request.setRawHeader("Content-Type","text/json");
 
     QNetworkReply* reply = manger.post(request, QJsonDocument(json).toJson());
@@ -473,6 +488,7 @@ bool FMPePayPrivate::GetPayJson(const QString& sum, const QString& code)
 
     _current_json.insert( FMP_EPAY_VER, ver);
     _current_json.insert( FMP_EPAY_REQUESTTYPE, 72);
+    _current_json.insert( FMP_EPAY_PARTNERID, q->_partner_id.toInt());
     _current_json.insert( FMP_EPAY_BUSINESSDATE, q->_businessdate);
     _current_json.insert( FMP_EPAY_CLIENTREQCOUNT, (int)((++s_ClientReqCount)%=10000000));
     _current_json.insert( FMP_EPAY_STOREID, q->_store_id);
@@ -517,6 +533,7 @@ bool FMPePayPrivate::GetRefundJson(const QString &sum, const QString &code, QStr
 
     _current_json.insert( FMP_EPAY_VER, ver);
     _current_json.insert( FMP_EPAY_REQUESTTYPE, 62);
+    _current_json.insert( FMP_EPAY_PARTNERID, q->_partner_id.toInt());
     _current_json.insert( FMP_EPAY_CLIENTREQCOUNT, (int)((++s_ClientReqCount)%=10000000));
     _current_json.insert( FMP_EPAY_STOREID, q->_store_id);
     _current_json.insert( FMP_EPAY_STATIONID, q->_station_id);

version.h

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