更新到1.0.1.3

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

@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "智铺子收银系统"
-!define PRODUCT_VERSION "1.0.1.2"
+!define PRODUCT_VERSION "1.0.1.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"

zhipuzi_pos_windows/page/CShoukuanPageUI.cpp

@@ -627,6 +627,12 @@ void CShoukuanPageUI::StartHuiyuanShoukuan()
 
 	this->ClickMemberLogin();
 
+	if (m_is_member == false)
+	{
+		//说明登录失败了
+		return;
+	}
+
 	//登录成功了，马上开始进行支付确认
 	CHuiyuanShoukuanWnd* pShoukuanWnd = new CHuiyuanShoukuanWnd();
 	if (pShoukuanWnd != NULL)
@@ -671,6 +677,9 @@ void CShoukuanPageUI::StartHuiyuanShoukuan()
 
 		m_is_show_modal_wnd = false;
 		delete pShoukuanWnd;
+
+		//不管是会员支付成功还是失败，都清空之前登录的会员信息
+		this->ClickMemberLogout();
 	}
 }
 
@@ -1013,10 +1022,5 @@ void CShoukuanPageUI::ClickMemberLogout()
 {
 	m_is_member = false;
 
-	CButtonUI* pMemberLoginBtn = static_cast<CButtonUI*>(this->FindSubControl(_T("btn_diandan_member_login")));
-	pMemberLoginBtn->SetVisible(true);
-
-	this->FindSubControl(_T("diandan_page_member_info"))->SetVisible(false);
-
 	this->UpdateJiesuanInfo();
 }

zhipuzi_pos_windows/print/CPosPrinterData.cpp

@@ -2565,6 +2565,10 @@ std::vector<ChufangPrinterContent> CPosPrinterData::PrintZhengcanOrderXiadanChuf
 
 			POS_FeedLine();
 
+			string table_name = "桌号：" + order.table_name;
+			POS_TextOut(table_name, true, true, 1);
+			POS_FeedLine();
+
 			string order_type = "订单号：" + order.show_trade_no;
 			POS_TextOut(order_type, false, false, 0);
 			POS_FeedLine();
@@ -2885,6 +2889,10 @@ std::vector<ChufangPrinterContent> CPosPrinterData::PrintZhengcanOrderTuicaiChuf
 
 			POS_FeedLine();
 
+			string table_name = "桌号：" + order.table_name;
+			POS_TextOut(table_name, true, true, 1);
+			POS_FeedLine();
+
 			string order_type = "订单号：" + order.show_trade_no;
 			POS_TextOut(order_type, false, false, 0);
 			POS_FeedLine();