1. 修复富贾测试宏定义部分的错误。

fmp_vip.pro

@@ -12,6 +12,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 CONFIG += c++11
 
 DEFINES += YCYZ_FUGU \
+        FM_TEST
 #        FM_DEBUG
 
 SOURCES += \

global.h

@@ -11,16 +11,18 @@
 //#define KEY_CODE		 "a35e33c8-e6f2-4107-8670-a69a85adf85b"
 //#define PARTNER_ID		 "f92b8997-40c7-4622-af3b-512fd49d6113"
 
-#ifdef YCYZ_FUGU_TEST
-////! 一茶一座_富罟测试
-#define APP_ID			 "T021"
-#define KEY_CODE		 "5f300ce7-8d00-464f-a969-f9ebb4c0e7d4"
-#define PARTNER_ID		 "ea86bff6-1783-4c4a-9dee-0189de37b6eb"
-#elif YCYZ_FUGU
-////! 一茶一座_富罟
-#define APP_ID			 "T020"
-#define KEY_CODE		 "0206c33a-aa2d-49e5-bdd1-3107143a252f"
-#define PARTNER_ID		 "8d5b84a9-0cb6-417f-b87d-ff39d17ad311"
+#ifdef YCYZ_FUGU
+    #ifdef FM_TEST
+    ////! 一茶一座_富罟测试
+    #define APP_ID			 "T021"
+    #define KEY_CODE		 "5f300ce7-8d00-464f-a969-f9ebb4c0e7d4"
+    #define PARTNER_ID		 "ea86bff6-1783-4c4a-9dee-0189de37b6eb"
+    #else
+    ////! 一茶一座_富罟
+    #define APP_ID			 "T020"
+    #define KEY_CODE		 "0206c33a-aa2d-49e5-bdd1-3107143a252f"
+    #define PARTNER_ID		 "8d5b84a9-0cb6-417f-b87d-ff39d17ad311"
+    #endif  //#ifdef FM_TEST
 #else
 ////! 一茶一座
 #define APP_ID			 "T014"

task/taskpay.cpp

@@ -169,7 +169,7 @@ void TaskPay::packageServerReq()
     transData["payList"] = payList;
 #ifdef YCYZ_FUGU
     transData[ServerProps(PosProps.PaidAmount)] = payAmount;
-#elif
+#else
     transData[ServerProps(PosProps.Pay_amount)] = payAmount;
 #endif