Browse Source

调试外卖功能

zhangyang 4 years ago
parent
commit
5c0e39dd49

BIN
bin/Win32/Debug/zhipuzi_pos_windows/db/pos.db


+ 1 - 1
zhipuzi_pos_windows/control/CWaimaiOrderInfoUI.cpp

@@ -14,7 +14,7 @@ void CWaimaiOrderInfoUI::Refresh(CWaimaiOrder& order)
 	this->FindSubControl(_T("waimai_order_info_page_liushuihao"))->SetText(liushuihao_show.c_str());
 
 	std::wstring order_no_show = L"订单号:" + CLewaimaiString::UTF8ToUnicode(order.m_order_no);
-	this->FindSubControl(_T("waimai_order_info_page_order_no"))->SetText(order_no_show.c_str());
+	this->FindSubControl(_T("waimai_order_info_page_order_num"))->SetText(order_no_show.c_str());
 
 	//商品详情的渲染
 	CListUI* pFoodList = static_cast<CListUI*>(this->FindSubControl(_T("waimai_order_info_page_foodlist")));

+ 1 - 1
zhipuzi_pos_windows/control/CWaimaiOrderItemUI.cpp

@@ -41,7 +41,7 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 	this->FindSubControl(L"waimai_order_list_price")->SetText(price_show.c_str());
 
 	std::wstring order_no_show = L"#" + CLewaimaiString::UTF8ToUnicode(m_restaurant_number) + L"  订单号:" + CLewaimaiString::UTF8ToUnicode(m_order_no);
-	this->FindSubControl(L"waimai_order_list_order_no")->SetText(order_no_show.c_str());
+	this->FindSubControl(L"waimai_order_list_order_num")->SetText(order_no_show.c_str());
 
 	std::wstring init_date_show = L"下单时间:" + CLewaimaiString::UTF8ToUnicode(m_init_date);
 	this->FindSubControl(L"waimai_order_list_init_date")->SetText(init_date_show.c_str());

+ 0 - 1
zhipuzi_pos_windows/order/CWaimaiOrder.cpp

@@ -116,7 +116,6 @@ bool CWaimaiOrder::InitData(std::string order_id, std::string order_no)
             m_machine_qrcode_url = data["machine_qrcode_url"].GetString();
             m_machine_qrcode_title = data["machine_qrcode_title"].GetString();
             m_delivery_date = data["delivery_date"].GetString();
-            m_head_picture = data["head_picture"].GetString();
             m_courier = data["courier"].GetString();
             m_delivertime = data["delivertime"].GetString();
             m_customer_order_total = data["customer_order_total"].GetString();

+ 0 - 1
zhipuzi_pos_windows/order/CWaimaiOrder.h

@@ -109,7 +109,6 @@ public:
     std::string m_machine_qrcode_url;
     std::string m_machine_qrcode_title;
     std::string m_delivery_date;
-    std::string m_head_picture;
     std::string m_courier;
     std::string m_delivertime;
     std::string m_customer_order_total;