Skip to content

F
fmp_vip
Commit 77eccda9 by NitefullWind
Options

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

parent 7a5e127a
Showing with 14 additions and 11 deletions
fmp_vip.pro
...@@ -12,6 +12,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets ...@@ -12,6 +12,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
CONFIG += c++11 CONFIG += c++11
DEFINES += YCYZ_FUGU \ DEFINES += YCYZ_FUGU \
FM_TEST
# FM_DEBUG # FM_DEBUG
SOURCES += \ SOURCES += \
......
global.h
...@@ -11,16 +11,18 @@ ...@@ -11,16 +11,18 @@
//#define KEY_CODE "a35e33c8-e6f2-4107-8670-a69a85adf85b" //#define KEY_CODE "a35e33c8-e6f2-4107-8670-a69a85adf85b"
//#define PARTNER_ID "f92b8997-40c7-4622-af3b-512fd49d6113" //#define PARTNER_ID "f92b8997-40c7-4622-af3b-512fd49d6113"
#ifdef YCYZ_FUGU_TEST #ifdef YCYZ_FUGU
////! 一茶一座_富罟测试 #ifdef FM_TEST
#define APP_ID "T021" ////! 一茶一座_富罟测试
#define KEY_CODE "5f300ce7-8d00-464f-a969-f9ebb4c0e7d4" #define APP_ID "T021"
#define PARTNER_ID "ea86bff6-1783-4c4a-9dee-0189de37b6eb" #define KEY_CODE "5f300ce7-8d00-464f-a969-f9ebb4c0e7d4"
#elif YCYZ_FUGU #define PARTNER_ID "ea86bff6-1783-4c4a-9dee-0189de37b6eb"
////! 一茶一座_富罟 #else
#define APP_ID "T020" ////! 一茶一座_富罟
#define KEY_CODE "0206c33a-aa2d-49e5-bdd1-3107143a252f" #define APP_ID "T020"
#define PARTNER_ID "8d5b84a9-0cb6-417f-b87d-ff39d17ad311" #define KEY_CODE "0206c33a-aa2d-49e5-bdd1-3107143a252f"
#define PARTNER_ID "8d5b84a9-0cb6-417f-b87d-ff39d17ad311"
#endif //#ifdef FM_TEST
#else #else
////! 一茶一座 ////! 一茶一座
#define APP_ID "T014" #define APP_ID "T014"
......
task/taskpay.cpp
...@@ -169,7 +169,7 @@ void TaskPay::packageServerReq() ...@@ -169,7 +169,7 @@ void TaskPay::packageServerReq()
transData["payList"] = payList; transData["payList"] = payList;
#ifdef YCYZ_FUGU #ifdef YCYZ_FUGU
transData[ServerProps(PosProps.PaidAmount)] = payAmount; transData[ServerProps(PosProps.PaidAmount)] = payAmount;
#elif #else
transData[ServerProps(PosProps.Pay_amount)] = payAmount; transData[ServerProps(PosProps.Pay_amount)] = payAmount;
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment