修复2个bug

zhipuzi_pos_windows/page/CWaimaiOrderListPageUI.cpp

@@ -351,7 +351,7 @@ void CWaimaiOrderListPageUI::DoRefresh()
 		return;
 	}
 
-	if (!document.HasMember("errcode") || !document.HasMember("errmsg") || !document.HasMember("data"))
+	if (!document.HasMember("errcode") || !document.HasMember("errmsg"))
 	{
 		LOG_INFO("json error!");
 		return;
@@ -362,6 +362,14 @@ void CWaimaiOrderListPageUI::DoRefresh()
 	if (errcode != 0)
 	{
 		LOG_INFO("response failed! message:" << document["errmsg"].GetString());
+
+		std::string errmsg = document["errmsg"].GetString();
+		m_pMainWnd->ShowToast(CLewaimaiString::UTF8ToUnicode(errmsg));
+
+		pOrderListLayout->SetVisible(true);
+
+		this->FindSubControl(_T("main_orderlist_loading"))->SetVisible(false);
+
 		return;
 	}
 

zhipuzi_pos_windows/print/CPosPrinterData.cpp

@@ -207,7 +207,13 @@ std::string CPosPrinterData::PrintWaimaiOrderShouyin(CWaimaiOrder& order)
         //预设选项
         if(order.m_order_field.size() > 1)
         {
-            for(std::vector<CWaimaiOrderField>::iterator it = order.m_order_field.begin(); it != order.m_order_field.end() - 1; it++)
+			if (order.m_is_selftake == "0")
+			{
+				//如果是外卖配送订单，移除最后的配送时间
+				order.m_order_field.pop_back();
+			}
+
+            for(std::vector<CWaimaiOrderField>::iterator it = order.m_order_field.begin(); it != order.m_order_field.end(); it++)
             {
                 string order_field = CLewaimaiString::UTF8ToANSI((*it).name) + "：" + CLewaimaiString::UTF8ToANSI((*it).value);
                 POS_TextOut(order_field, false, false, 0);

zhipuzi_pos_windows/zhipuzi/CWaimaiOrder.cpp

@@ -69,7 +69,7 @@ bool CWaimaiOrder::InitData(std::string order_id, std::string order_no)
             m_delivery = data["delivery"].GetFloat();
             m_price = data["price"].GetFloat();
             m_order_date = data["order_date"].GetString();
-            m_order_fields = data["order_fields"].GetString();
+            m_order_fields = CLewaimaiJson::ToString(data["order_fields"]);
             m_order_status = data["order_status"].GetString();
             m_courier_id = data["courier_id"].GetString();
             m_is_selftake = data["is_selftake"].GetString();