添加新的充值商户号

fmp_epay.cpp

@@ -11,6 +11,7 @@ FMPePay::FMPePay(ctkPluginContext *context)
       _inited(false),
       //_needanimation(false),
       _partner_id(QString("")),
+      _recharge_partner_id(QString("2278")),
       _databasename(DEFAULT_EPAY_DATABASENAME),
       _table(DEFAULT_EPAY_TABLE),
       _businessdate(QDateTime::currentDateTime().toString("yyyy-MM-dd")),

fmp_epay.h

@@ -48,6 +48,7 @@ private:
     QString             _station_id;
     QString             _operator_id;
     QString             _partner_id;
+    QString             _recharge_partner_id;   //Only for recharge,add on 2019.9.6
     int                 _time_out;
 
 

fmp_epay_def.h

@@ -13,6 +13,7 @@
 #define FMP_EPAY_STOREID                "store_id"
 #define FMP_EPAY_TRANSID                "trans_id"
 #define FMP_EPAY_PARTNERID              "partnerId"
+#define FMP_EPAY_RECHARGE               "recharge"
 #define FMP_EPAY_TRANSTRACTION          "transactions"
 #define FMP_EPAY_TRANSTRACTION_AMOUNT   "amount"
 #define FMP_EPAY_TRANSTRACTION_CODE     "code"

fmp_epay_p.cpp

@@ -148,7 +148,9 @@ void FMPePayPrivate::Init()
     auto_close_seconds=_setting->GetInt(FMP_INIKEY_EPAYAUTOCLOSE);
     auto_close_seconds=auto_close_seconds>0 ? auto_close_seconds:5;
 
-    hash[FMP_EPAY_PARTNERID] = q->_partner_id;
+    hash[FMP_EPAY_PARTNERID] = (_origin_request.contains(FMP_EPAY_RECHARGE) && _origin_request[FMP_EPAY_RECHARGE].toBool())?
+                q->_recharge_partner_id:
+                q->_partner_id;
     hash[FMP_EPAY_TIMEOUT] = q->_time_out;
 
     if (!_is_api) {
@@ -454,7 +456,9 @@ void FMPePayPrivate::ControlQueryJson(const QJsonObject &trans)
 
         _docked_request[FMP_EPAY_VER] = 3;
         _docked_request[FMP_EPAY_REQUESTTYPE] = 52;
-        _docked_request.insert( FMP_EPAY_PARTNERID, q->_partner_id.toInt());
+        _docked_request.insert( FMP_EPAY_PARTNERID,
+                                (_origin_request.contains(FMP_EPAY_RECHARGE) && _origin_request[FMP_EPAY_RECHARGE].toBool())?
+                                                q->_recharge_partner_id.toInt():q->_partner_id.toInt());
         _docked_request[FMP_EPAY_STOREID] = _origin_request[FMP_EPAY_STOREID];
         _docked_request[FMP_EPAY_STATIONID] = _origin_request["pos_id"];
         _docked_request[FMP_EPAY_OPERATORID] = _origin_request[FMP_EPAY_OPERATORID];
@@ -832,7 +836,9 @@ bool FMPePayPrivate::GetPayJson(const QString& sum, const QString& code)
 
     _docked_request.insert( FMP_EPAY_VER, ver);
     _docked_request.insert( FMP_EPAY_REQUESTTYPE, 72);
-    _docked_request.insert( FMP_EPAY_PARTNERID, q->_partner_id.toInt());
+    _docked_request.insert( FMP_EPAY_PARTNERID,
+                            (_origin_request.contains(FMP_EPAY_RECHARGE) && _origin_request[FMP_EPAY_RECHARGE].toBool())?
+                                            q->_recharge_partner_id.toInt():q->_partner_id.toInt());
     _docked_request.insert( FMP_EPAY_CLIENTREQCOUNT, (int)((++s_ClientReqCount)%=10000000));
 
 //    _docked_request.insert( FMP_EPAY_TRANSID, QDateTime::currentDateTime().toString("yyyyMMddhhmmsszzz"));
@@ -882,7 +888,9 @@ bool FMPePayPrivate::GetRefundJson(const QJsonObject &trans)
 
     _docked_request.insert( FMP_EPAY_VER, ver);
     _docked_request.insert( FMP_EPAY_REQUESTTYPE, 62);
-    _docked_request.insert( FMP_EPAY_PARTNERID, q->_partner_id.toInt());
+    _docked_request.insert( FMP_EPAY_PARTNERID,
+                            (_origin_request.contains(FMP_EPAY_RECHARGE) && _origin_request[FMP_EPAY_RECHARGE].toBool())?
+                                            q->_recharge_partner_id.toInt():q->_partner_id.toInt());
     _docked_request.insert( FMP_EPAY_CLIENTREQCOUNT, (int)((++s_ClientReqCount)%=10000000));
 
     if (_is_api) {

version.h

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