1.修复返回信息更加清晰

ZH_Client/ClassDiagram1.cd

+ 
\ No newline at end of file

ZH_Client/ZH_Client.vcxproj

@@ -125,6 +125,9 @@
     <ClInclude Include="testtool.h" />
     <ClInclude Include="utf.h" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="ClassDiagram1.cd" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

ZH_Client/ZH_Client.vcxproj.filters

@@ -138,4 +138,7 @@
       <Filter>Header Files\TestCase</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="ClassDiagram1.cd" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

ZH_Client/fmerror.h

@@ -23,4 +23,8 @@
 //#define ERROR_CRET				"{\"statusCode\": 307, \"message\": \"\u8BC1\u4E66\u52A0\u8F7D\u5931\u8D25\u65E0\u6CD5\u8FDB\u884C\u4EA4\u6613\"}"
 #define ERROR_CRET				"{\"statusCode\": 307, \"message\": \"\350\257\201\344\271\246\345\212\240\350\275\275\345\244\261\350\264\245\346\227\240\346\263\225\350\277\233\350\241\214\344\272\244\346\230\223\"}"
 
+//#define ERROR_RESINDATA		"{\"statusCode\": 307, \"message\": \"RES输入参数不合法\"}"
+#define ERROR_RESINDATA			"{\"statusCode\": 308, \"message\": \"RES\350\276\223\345\205\245\345\217\202\346\225\260\344\270\215\345\220\210\346\263\225\"}"
+
+
 #endif
\ No newline at end of file

ZH_Client/fmglobal.h

@@ -13,8 +13,8 @@
 
 #define REQUEST_CRET				"{\r\n    \"ver\": 1,\r\n    \"reqType\": 99,\r\n    \"partnerId\":%d,\r\n    \"storeId\":\"%s\",\r\n    \"stationId\": \"%s\"\r\n}"
 #define REQUEST_0					"{\r\n    \"ver\": 1,\r\n    \"reqType\": %s,\r\n    \"partnerId\":%d,\r\n    \"storeId\":\"%s\",\r\n    \"stationId\": \"%s\",\r\n    \"operatorId\":\"%s\",\r\n    \"code\":\"%s\"\r\n}"
-#define REQUEST_3					"{\r\n    \"ver\": 1,\r\n    \"reqType\": %s,\r\n    \"partnerId\":%d,\r\n    \"storeId\":\"%s\",\r\n    \"stationId\": \"%s\",\r\n    \"operatorId\":\"%s\",\r\n    \"code\":\"%s\",\r\n    \"businessDate\":\"%s\",\r\n    \"amount\":\"%d\",\r\n    \"transId\":\"%s\"\r\n}"
-#define REQUEST_71					"{\r\n    \"ver\": 1,\r\n    \"reqType\": %s,\r\n    \"partnerId\":%d,\r\n    \"storeId\":\"%s\",\r\n    \"stationId\": \"%s\",\r\n    \"operatorId\":\"%s\",\r\n    \"code\":\"%s\",\r\n    \"businessDate\":\"%s\",\r\n    \"amount\":\"%d\",\r\n    \"transId\":\"%s\"\r\n}"
+#define REQUEST_3					"{\r\n    \"ver\": 1,\r\n    \"reqType\": %s,\r\n    \"partnerId\":%d,\r\n    \"storeId\":\"%s\",\r\n    \"stationId\": \"%s\",\r\n    \"operatorId\":\"%s\",\r\n    \"code\":\"%s\",\r\n    \"businessDate\":\"%s\",\r\n    \"transAmount\":\"%d\",\r\n    \"transId\":\"%s\"\r\n}"
+#define REQUEST_71					"{\r\n    \"ver\": 1,\r\n    \"reqType\": %s,\r\n    \"partnerId\":%d,\r\n    \"storeId\":\"%s\",\r\n    \"stationId\": \"%s\",\r\n    \"operatorId\":\"%s\",\r\n    \"code\":\"%s\",\r\n    \"businessDate\":\"%s\",\r\n    \"transAmount\":\"%d\",\r\n    \"transId\":\"%s\"\r\n}"
 
 #define DES3_KEY					"ABCD@#9876DFSAAWKLDEOPDD"
 #define CRET_FILE_NAME				"client.p12"

ZH_Client/sbk_client.cpp

@@ -766,10 +766,10 @@ extern "C"
 
 		LOG() << "get RES indata : " << indata;
 
-		if(!RESToJson(tmpin, out) && out.size() >= MAX_BUF_LEN)
+		if(!RESToJson(tmpin, out) || out.size() >= MAX_BUF_LEN)
 		{
 			string outstr;
-			JsonToRES(string(ERROR_INDATA), outstr);
+			JsonToRES(string(ERROR_RESINDATA), outstr);
 			strcpy(outdata, outstr.data());
 			LOG() << "send RES outdata : " << outdata;
 			return 0;
@@ -1210,9 +1210,9 @@ void testinitclient()
 //char a[] = "{\"businessDate\":\"20170526\",\"code\":\"7310180009462033\",\"operatorId\":\"90001\",\"partnerId\":1443,\"products\":[{\"consume_num\":1,\"discount\":0,\"name\":\"Coffee\",\"number\":0,\"payment\":null,\"pid\":\"3488\",\"price\":3100,\"priceAct\":0,\"salesType\":\"Normal\",\"scope\":null}],\"promotionTag\":null,\"reqType\":71,\"stationId\":\"3\",\"storeId\":\"1713\",\"transAmount\":3100,\"transId\":\"6460\",\"undiscountAmount\":0,\"ver\":1}";
 //char a[] = "{\r\n    \"ver\": 1,\r\n    \"reqType\": 71,\r\n    \"partnerId\":  1443,\r\n    \"stationId\": \"1\",\r\n    \"storeId\": \"12344\",\r\n    \"operatorId\": \"9\",\r\n    \"code\": \"adadadada\"\r\n}";
 char a[] = "{\r\n    \"businessDate\": \"20170601\",\r\n    \"code\": \"7310188850000277\",\r\n    \"operatorId\": \"90001\",\r\n    \"partnerId\": 1443,\r\n    \"partnerOrderId\": \"1443171223323\",\r\n    \"products\": [\r\n        {\r\n            \"consume_num\": 1,\r\n            \"discount\": 0,\r\n            \"name\": \"Coffee\",\r\n            \"number\": 0,\r\n            \"payment\": null,\r\n            \"pid\": \"3488\",\r\n            \"price\": 3100,\r\n            \"priceAct\": 0,\r\n            \"salesType\": \"Normal\",\r\n            \"scope\": null\r\n        }\r\n    ],\r\n    \"promotionTag\": null,\r\n    \"reqType\": 102,\r\n    \"stationId\": \"9\",\r\n    \"storeId\": \"12344\",\r\n    \"transAmount\": 29,\r\n    \"transId\": \"1\",\r\n    \"undiscountAmount\": 0,\r\n    \"ver\": 1\r\n}";
-char ls[] = "0|1443|99999|1|01|13245678998|END|";
-char ls1[] = "3|1443|99999|1|01|13245678998|20170714||8888|END|";
-char ls2[] = "71|1443|99999|1|01|13245678998|20170714||8888|END|";
+char ls[] = "0|1443|fm9999|1|01|120754391530891|END|";
+char ls1[] = "3|1443|fm9999|1|01|120754391530891|20170717||8888|END|";
+char ls2[] = "71|1443|fm9999|1|01|120754391530891|20170717||8888|END|";
 
 void testCheckRollbackData()
 {
@@ -1243,7 +1243,7 @@ int main()
 
 	char b[MAX_BUF_LEN];
 
-	RESGetValue(ls2, b);
+	RESGetValue(ls1, b);
 
 	//char c[MAX_BUF_LEN] = { 0 };