张洋 4 年 前
コミット
3c43fd1a0f

BIN
bin/Win32/Release/setup/zhipuzi_pos_windows_setup_1.0.0.2.exe


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

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

BIN
zhipuzi_pos_windows/resource/zhipuzi_pos_windows.aps


BIN
zhipuzi_pos_windows/resource/zhipuzi_pos_windows.rc


+ 13 - 0
zhipuzi_pos_windows/worker/CMessagePushWorker.cpp

@@ -271,4 +271,17 @@ void CMessagePushWorker::HandelMessage(std::string msg)
 		//CPosPrinter printer;
 		//printer.PrintDiandanOrder(order_id);
 	}
+	else if (type == MESSAGE_TYPE::NEW_KUAICANSHANGJIAAPP_ORDER)
+	{
+		std::string order_id = document["waimai_order_id"].GetString();
+
+		//新订单来了,首先判断是否要语音提醒
+		if (CSetting::GetInstance()->GetParam("setting_is_new_diannei_voice") == "1")
+		{
+			CVoiceWorker::GetInstance()->AddVoice(5);
+		}
+
+		CPosPrinter printer;
+		printer.PrintDiandanOrder(order_id);
+	}
 }

+ 1 - 0
zhipuzi_pos_windows/worker/CMessagePushWorker.h

@@ -23,6 +23,7 @@ enum MESSAGE_TYPE
 	REFUND_WAIMAI_ORDER = 3,
 
 	NEW_KAUICANTANGSHI_ORDER = 4,
+	NEW_KUAICANSHANGJIAAPP_ORDER = 5, //商家app下单的,自动打印
 };
 
 //这个类专门用于接收服务器端的消息推送