修改windows收银系统版本号

bin/Win32/Release/setup/智铺子收银系统安装脚本.nsi

@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "智铺子收银系统"
-!define PRODUCT_VERSION "1.0.1.5"
+!define PRODUCT_VERSION "1.0.2.0"
 !define PRODUCT_PUBLISHER "深圳市迅享智慧云科技有限公司"
 !define PRODUCT_WEB_SITE "https://www.zhipuzi.com"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"

zhipuzi_pos_windows/print/CPosPrinterData.cpp

@@ -2456,6 +2456,10 @@ std::string CPosPrinterData::PrintZhengcanOrderXiadanBiaoqian(CZhengcanOrder& or
 
 			curFoodNum++;
 
+			//打印桌号
+			string zhuoweiInfo = CLewaimaiString::UTF8ToANSI(order.table_name);
+			textData += BIAOQIAN_TEXTGet(zhuoweiInfo, 12, 6, 1, 1);
+
 			//打印份数
 			std::string numInfo = to_string(curFoodNum) + "/" + to_string(foodNum);
 			textData += BIAOQIAN_TEXTGet(numInfo, 180, 6, 1, 1);
@@ -2736,6 +2740,10 @@ std::vector<ChufangPrinterContent> CPosPrinterData::PrintZhengcanOrderXiadanChuf
 
 				POS_FeedLine();
 
+				string table_name = "桌号：" + CLewaimaiString::UTF8ToANSI(order.table_name);
+				POS_TextOut(table_name, true, true, 1);
+				POS_FeedLine();
+
 				string order_type = "订单号：" + order.show_trade_no + "  ";
 
 				POS_TextOut(order_type, false, true, 1);

zhipuzi_pos_windows/worker/CMqttClientWorker.cpp

@@ -242,15 +242,9 @@ void CMqttClientWorker::HandleMessage(std::string message)
 		return;
 	}
 
-	int type;
-	if (document["msg_type"].IsInt())
-	{
-		type = document["msg_type"].GetInt();
-	}
-	else
-	{
-		type = atoi(document["msg_type"].GetString());
-	}
+	rapidjson::Value& data = document["data"];
+
+	int type = CLewaimaiJson::ToInt(data["msg_type"]);
 
 	if (type == MESSAGE_TYPE::LOGIN_OFFLINE)
 	{
@@ -259,8 +253,8 @@ void CMqttClientWorker::HandleMessage(std::string message)
 	}
 	else if (type == MESSAGE_TYPE::NEW_WAIMAI_ORDER)
 	{
-		std::string order_id = document["waimai_order_id"].GetString();
-		std::string order_no = document["waimai_order_no"].GetString();
+		std::string order_id = CLewaimaiJson::ToString(data["waimai_order_id"]);
+		std::string order_no = CLewaimaiJson::ToString(data["waimai_order_no"]);
 
 		//新订单来了，首先判断是否要语音提醒
 		if (CSetting::GetInstance()->GetParam("setting_is_new_waimai_voice") == "1")
@@ -294,7 +288,7 @@ void CMqttClientWorker::HandleMessage(std::string message)
 	}
 	else if (type == MESSAGE_TYPE::NEW_KAUICANTANGSHI_ORDER)
 	{
-		std::string order_id = document["waimai_order_id"].GetString();
+		std::string order_id = CLewaimaiJson::ToString(data["waimai_order_id"]);
 
 		//新订单来了，首先判断是否要语音提醒
 		if (CSetting::GetInstance()->GetParam("setting_is_new_diannei_voice") == "1")
@@ -310,7 +304,7 @@ void CMqttClientWorker::HandleMessage(std::string message)
 	}
 	else if (type == MESSAGE_TYPE::NEW_KUAICANSHANGJIAAPP_ORDER)
 	{
-		std::string order_id = document["waimai_order_id"].GetString();
+		std::string order_id =  CLewaimaiJson::ToString(data["waimai_order_id"]);
 
 		//新订单来了，首先判断是否要语音提醒
 		if (CSetting::GetInstance()->GetParam("setting_is_new_diannei_voice") == "1")
@@ -326,8 +320,8 @@ void CMqttClientWorker::HandleMessage(std::string message)
 	}
 	else if (type == MESSAGE_TYPE::NEW_ZHENGCAN_JIACAI)
 	{
-		std::string order_id = document["waimai_order_id"].GetString();
-		std::string jiacai_no = document["jiacai_no"].GetString();
+		std::string order_id = CLewaimaiJson::ToString(data["waimai_order_id"]);
+		std::string jiacai_no = CLewaimaiJson::ToString(data["jiacai_no"]);
 
 		if (CSetting::GetInstance()->GetParam("setting_is_new_diannei_saomadiancan_printer") == "1")
 		{
@@ -344,8 +338,8 @@ void CMqttClientWorker::HandleMessage(std::string message)
 	}
 	else if (type == MESSAGE_TYPE::NEW_ZHENGCAN_TUICAI)
 	{
-		std::string order_id = document["waimai_order_id"].GetString();
-		std::string tuicai_item_id = document["tuicai_item_id"].GetString();
+		std::string order_id = CLewaimaiJson::ToString(data["waimai_order_id"]);
+		std::string tuicai_item_id = CLewaimaiJson::ToString(data["tuicai_item_id"]);
 
 		if (CSetting::GetInstance()->GetParam("setting_is_new_diannei_saomadiancan_printer") == "1")
 		{
@@ -355,7 +349,7 @@ void CMqttClientWorker::HandleMessage(std::string message)
 	}
 	else if (type == MESSAGE_TYPE::NEW_ZHENGCAN_JIESUAN)
 	{
-		std::string order_id = document["waimai_order_id"].GetString();
+		std::string order_id = CLewaimaiJson::ToString(data["waimai_order_id"]);
 
 		if (CSetting::GetInstance()->GetParam("setting_is_new_diannei_saomadiancan_printer") == "1")
 		{