更新到1.0.0.8版本

bin/Win32/Debug/zhipuzi_pos_windows/skin/jiaoban_page.xml

@@ -8,7 +8,7 @@
 		<VerticalLayout name="data_layout" visible="false" vscrollbar="true">
 			<HorizontalLayout height="180" padding="20,20,20,0" bkcolor="#FFFFFFFF">
 				<VerticalLayout width="474">
-					<Label text="开班时间" font="2" padding="30,30,0,0"></Label>
+					<Label text="开班时间" font="2" padding="30,30,0,0" textcolor="#FF777777"></Label>
 					<Combo name="jiaoban_page_init_time_select" vscrollbar="false" dropboxsize="0,300" padding="30,20,0,0" width="200" height="32" tooltip="请点击这里选择您的标签纸出纸方向" normalimage="file='Setting_Combox_Normal.png' corner='2,2,24,2'" hotimage="file='Setting_Combox_Hover.png' corner='2,2,24,2'" pushedimage="Setting_Combox_Click.png' corner='2,2,24,2'" textpadding="10,1,1,1" >
 						
 					</Combo>
@@ -18,25 +18,23 @@
 				<Control width="1" bkcolor="#FFEEEEEE" padding="0,10,0,10"></Control>
 				
 				<VerticalLayout width="474">
-					<Label text="交班时间" font="2" padding="30,30,0,0"></Label>
+					<Label text="交班时间" font="2" padding="30,30,0,0" textcolor="#FF777777"></Label>
 					<Label name="jiaoban_page_end_time" text="" padding="30,20,0,0"></Label>
 				</VerticalLayout>
+				
+				<Control width="1" bkcolor="#FFEEEEEE" padding="0,10,0,10"></Control>
+				
+				<VerticalLayout width="474">
+					<Label text="交班账号" font="2" padding="30,30,0,0" textcolor="#FF777777"></Label>
+					<Label name="jiaoban_page_account" text="" padding="30,20,0,0"></Label>
+					<Label text="*交班数据只展示当前账号关联订单的数据*" padding="30,15,0,0"></Label>
+				</VerticalLayout>
 			</HorizontalLayout>
 			
 			<VerticalLayout name="jiaoban_page_yingye_layout" padding="0,30,0,0">
 				<Label text="营业概况" font="2" padding="20,0,0,0" height="30"></Label>
 				
-				<HorizontalLayout name="jiaoban_page_yingye_items">					
-					<VerticalLayout bkcolor="#FFFFFFFF" width="240" height="126" padding="20,15,0,0">
-						<Label name="waimai_num" text="" font="2" padding="20,25,0,0"></Label>
-						<Label text="外卖订单数量" padding="20,15,0,0" textcolor="#FF777777"></Label>
-					</VerticalLayout>
-					
-					<VerticalLayout bkcolor="#FFFFFFFF" width="240" height="126" padding="20,15,0,0">
-						<Label name="waimai_value" text="" font="2" padding="20,25,0,0"></Label>
-						<Label text="外卖营业额" padding="20,15,0,0" textcolor="#FF777777"></Label>
-					</VerticalLayout>
-					
+				<HorizontalLayout name="jiaoban_page_yingye_items">										
 					<VerticalLayout bkcolor="#FFFFFFFF" width="240" height="126" padding="20,15,0,0">
 						<Label name="diannei_num" text="" font="2" padding="20,25,0,0"></Label>
 						<Label text="店内订单数量" padding="20,15,0,0" textcolor="#FF777777"></Label>
@@ -47,6 +45,7 @@
 						<Label text="店内营业额" padding="20,15,0,0" textcolor="#FF777777"></Label>
 					</VerticalLayout>
 					
+					<!--
 					<VerticalLayout bkcolor="#FFFFFFFF" width="240" height="126" padding="20,15,0,0">
 						<Label name="huiyuan_num" text="" font="2" padding="20,25,0,0"></Label>
 						<Label text="新增会员数量" padding="20,15,0,0" textcolor="#FF777777"></Label>
@@ -56,6 +55,7 @@
 						<Label name="huiyuan_value" text="" font="2" padding="20,25,0,0"></Label>
 						<Label text="会员储值金额" padding="20,15,0,0" textcolor="#FF777777"></Label>
 					</VerticalLayout>
+					-->
 				</HorizontalLayout>
 			</VerticalLayout>
 			

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

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

@@ -27,6 +27,9 @@ void CJiaobanPageUI::InitShow()
 	CLabelUI* endLabel = static_cast<CLabelUI*>(this->FindSubControl(L"jiaoban_page_end_time"));
 	endLabel->SetText(CLewaimaiString::UTF8ToUnicode(m_end_time).c_str());
 
+	CLabelUI* acccountLabel = static_cast<CLabelUI*>(this->FindSubControl(L"jiaoban_page_account"));
+	acccountLabel->SetText(CLewaimaiString::UTF8ToUnicode(CZhipuziHttpClient::GetInstance()->GetUsername()).c_str());
+
 	InitJiaobanShijian();
 }
 
@@ -243,40 +246,34 @@ void CJiaobanPageUI::DoRefresh()
 	//获得数据成功
 	rapidjson::Value& data = document["data"];
 
-	m_waimai_num = to_string(data["waimai_member"].GetInt());
 	m_diannei_num = to_string(data["diannei_member"].GetInt());
-	m_huiyuan_num = to_string(data["today_member"].GetInt());
+	//m_huiyuan_num = to_string(data["today_member"].GetInt());
 
-	m_waimai_value = CLewaimaiString::DoubleToString(data["waimai_money"].GetFloat(), 2);
 	m_diannei_value = CLewaimaiString::DoubleToString(data["diannei_money"].GetFloat(), 2);
-	m_huiyuan_value = CLewaimaiString::DoubleToString(data["today_recharge"].GetFloat(), 2);
+	//m_huiyuan_value = CLewaimaiString::DoubleToString(data["today_recharge"].GetFloat(), 2);
 
 	m_diannei_refund_member = to_string(data["diannei_refund_member"].GetInt());
 	m_diannei_refund_money = CLewaimaiString::DoubleToString(data["diannei_refund_money"].GetFloat(), 2);
-	m_diannei_discount_money = CLewaimaiString::DoubleToString(data["diannei_refund_money"].GetFloat(), 2);
+	m_diannei_discount_money = CLewaimaiString::DoubleToString(data["diannei_discount_money"].GetFloat(), 2);
 
 	m_diannei_xianjin_value = CLewaimaiString::DoubleToString(data["ready_money"].GetFloat(), 2);
 	m_diannei_xianjin_tuikuan = CLewaimaiString::DoubleToString(data["ready_money_refund"].GetFloat(), 2);
 	m_diannei_xianjin_zengzhang = CLewaimaiString::DoubleToString(data["ready_money_boost"].GetFloat(), 2);
 
 	//开始渲染数据
-	CLabelUI* waimainumLabel = static_cast<CLabelUI*>(this->FindSubControl(L"waimai_num"));
-	waimainumLabel->SetText(CLewaimaiString::UTF8ToUnicode(m_waimai_num).c_str());
-
-	CLabelUI* waimaivalueLabel = static_cast<CLabelUI*>(this->FindSubControl(L"waimai_value"));
-	waimaivalueLabel->SetText(CLewaimaiString::UTF8ToUnicode(m_waimai_value).c_str());
-
 	CLabelUI* dianneinumLabel = static_cast<CLabelUI*>(this->FindSubControl(L"diannei_num"));
 	dianneinumLabel->SetText(CLewaimaiString::UTF8ToUnicode(m_diannei_num).c_str());
 
 	CLabelUI* dianneivalueLabel = static_cast<CLabelUI*>(this->FindSubControl(L"diannei_value"));
 	dianneivalueLabel->SetText(CLewaimaiString::UTF8ToUnicode(m_diannei_value).c_str());
 
+	/*
 	CLabelUI* huiyuannumLabel = static_cast<CLabelUI*>(this->FindSubControl(L"huiyuan_num"));
 	huiyuannumLabel->SetText(CLewaimaiString::UTF8ToUnicode(m_huiyuan_num).c_str());
 
 	CLabelUI* huiyuanvalueLabel = static_cast<CLabelUI*>(this->FindSubControl(L"huiyuan_value"));
 	huiyuanvalueLabel->SetText(CLewaimaiString::UTF8ToUnicode(m_huiyuan_value).c_str());
+	*/
 
 	CLabelUI* diannei_tuikuan_numLabel = static_cast<CLabelUI*>(this->FindSubControl(L"diannei_tuikuan_num"));
 	diannei_tuikuan_numLabel->SetText(CLewaimaiString::UTF8ToUnicode(m_diannei_refund_member).c_str());
@@ -309,11 +306,8 @@ void CJiaobanPageUI::StartJiaoban()
 	order.m_init_time = m_init_time;
 	order.m_end_time = m_end_time;
 
-	order.m_waimai_num = m_waimai_num;
 	order.m_diannei_num = m_diannei_num;
 	order.m_huiyuan_num = m_huiyuan_num;
-
-	order.m_waimai_value = m_waimai_value;
 	order.m_diannei_value = m_diannei_value;
 	order.m_huiyuan_value = m_huiyuan_value;
 
@@ -357,7 +351,7 @@ void CJiaobanPageUI::SetPos(RECT rc, bool bNeedInvalidate)
 	int num = 0;
 
 	CHorizontalLayoutUI* pFenleiLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("jiaoban_page_yingye_items")));
-	for (int i = 0; i < 6; i++)
+	for (int i = 0; i < 2; i++)
 	{
 		CVerticalLayoutUI* curItem = static_cast<CVerticalLayoutUI*>(pFenleiLayout->GetItemAt(i));
 

zhipuzi_pos_windows/page/CJiaobanPageUI.h

@@ -58,11 +58,9 @@ private:
 	std::string m_init_time;
 	std::string m_end_time;
 
-	std::string m_waimai_num;
 	std::string m_diannei_num;
 	std::string m_huiyuan_num;
 
-	std::string m_waimai_value;
 	std::string m_diannei_value;
 	std::string m_huiyuan_value;
 

zhipuzi_pos_windows/print/CPosPrinterData.cpp

@@ -2047,16 +2047,6 @@ std::string CPosPrinterData::PrintJiaobanOrder(CJiaobaoOrder& order)
 	POS_TextOut(lines);
 	POS_FeedLine();
 
-	string m_waimai_num = "外卖订单数量：" + CLewaimaiString::UTF8ToANSI(order.m_waimai_num);
-	POS_TextOut(m_waimai_num, false, false);
-	POS_FeedLine();
-
-	string m_diannei_num = "外卖营业额：" + CLewaimaiString::UTF8ToANSI(order.m_waimai_value);
-	POS_TextOut(m_diannei_num, false, false);
-	POS_FeedLine();
-
-	POS_FeedLine();
-
 	string m_huiyuan_num = "店内订单数量：" + CLewaimaiString::UTF8ToANSI(order.m_diannei_num);
 	POS_TextOut(m_huiyuan_num, false, false);
 	POS_FeedLine();
@@ -2067,6 +2057,7 @@ std::string CPosPrinterData::PrintJiaobanOrder(CJiaobaoOrder& order)
 
 	POS_FeedLine();
 
+	/*
 	string m_diannei_value = "新增会员数量：" + CLewaimaiString::UTF8ToANSI(order.m_huiyuan_num);
 	POS_TextOut(m_diannei_value, false, false);
 	POS_FeedLine();
@@ -2076,6 +2067,7 @@ std::string CPosPrinterData::PrintJiaobanOrder(CJiaobaoOrder& order)
 	POS_FeedLine();
 
 	POS_FeedLine();
+	*/
 
 	string m_diannei_refund_member = "店内退款订单数：" + CLewaimaiString::UTF8ToANSI(order.m_diannei_refund_member);
 	POS_TextOut(m_diannei_refund_member, false, false);

zhipuzi_pos_windows/zhipuzi/CJiaobanOrder.h

@@ -8,11 +8,9 @@ public:
 	std::string m_init_time;
 	std::string m_end_time;
 
-	std::string m_waimai_num;
 	std::string m_diannei_num;
 	std::string m_huiyuan_num;
 
-	std::string m_waimai_value;
 	std::string m_diannei_value;
 	std::string m_huiyuan_value;