1. 屏蔽非支付宝条码。 2. 修改密钥文件名。

sbkpay/DataProcess/fmglobal.h

@@ -16,7 +16,7 @@
 #define AES_KEY                     "ABCD@#9876DFSAAWKLDEOPDD"
 #define AES_KEY_PRT                 "1JG23G12Y12V123G123F1DI1"
 #define DES3_KEY_PRT				"1JG23G12Y12V123G123F1DI1"
-#define CRET_FILE_NAME				"client.p12"
+#define CRET_FILE_NAME				"simphonyclient.p12"
 #define JSON_KEY_ONLY				"partnerOrderId"
 #define JSON_KEY_MAC				"mac"
 #define JSON_KEY_SIGN				"sign"

sbkpay/control.cpp

@@ -582,16 +582,29 @@ void Control::Request(ReqType type, QStringList list)
     if(type == againprint)
         _fmId = list[0];
 
-    JsonFactory::GetJsonWithType(type, json, _posReqJsonObj, list);
+    bool isOk = true;
+    if(type == pay) {
+        QString payCode = list[0];
+        int beginNum = payCode.mid(0, 2).toInt();
+        if(beginNum<25 || beginNum>30) {
+            isOk = false;
+            SetResPonseWithMessage("23", QString::fromLocal8Bit("无效条码"));
+        }
+    }
 
-    QJsonDocument(json).toJson(QJsonDocument::Compact);
+    if(isOk) {
+        JsonFactory::GetJsonWithType(type, json, _posReqJsonObj, list);
 
-    bool rlt = SendMessageToServer(json, outdata, error, type);
+        QJsonDocument(json).toJson(QJsonDocument::Compact);
+
+        isOk = SendMessageToServer(json, outdata, error, type);
+
+        if(isOk)
+            isOk = Control::GetJson(type, rtjson, outdata, error);
+        else
+            SetResPonseWithMessage("23", error);
+    }
 
-    if(rlt)
-        rlt = Control::GetJson(type, rtjson, outdata, error);
-    else
-        SetResPonseWithMessage("23", error);
 
     //如果没有点击取消按钮走正常的退出或显示流程
     if(!_isinterrupt)
@@ -599,11 +612,11 @@ void Control::Request(ReqType type, QStringList list)
         _lock.lock();
         if(_widget != NULL && type == finds)
         {
-            _widget->ShowWiteJson(rlt, rtjson, error);
+            _widget->ShowWiteJson(isOk, rtjson, error);
         }
         else
         {
-            _widget->ShowWiteMGS(type, rlt, error);
+            _widget->ShowWiteMGS(type, isOk, error);
         }
         _lock.unlock();
     }
@@ -664,11 +677,11 @@ void Control::Request(ReqType type, QStringList list)
         _lock.lock();
         if(_widget != NULL && type == finds)
         {
-            _widget->ShowWiteJson(rlt, rtjson, error);
+            _widget->ShowWiteJson(isOk, rtjson, error);
         }
         else
         {
-            _widget->ShowWiteMGS(type, rlt, error);
+            _widget->ShowWiteMGS(type, isOk, error);
         }
         _lock.unlock();
 

sbkpay/version.h

@@ -3,7 +3,7 @@
 
 #define VER_MAJOR 0
 #define VER_MINOR 2
-#define VER_REVISION 1
+#define VER_REVISION 2
 
 #define VER_BUILD 1