Browse Source

修复标签打印机预约日期不对的问题

张洋 2 years ago
parent
commit
f71064ef2a

+ 3 - 3
zhipuzi_pos_windows/network/CZhipuziHttpClient.cpp

@@ -15,9 +15,9 @@ CZhipuziHttpClient::CZhipuziHttpClient()
 
 
 	if (m_env == DEV)
 	if (m_env == DEV)
 	{
 	{
-		m_pingtai_url = "https://pf-api-dev3.zhipuzi.com/pos";
-		m_canyin_yewu_url = "https://cyapi-dev3.zhipuzi.com/pos";
-		m_lingshou_yewu_url = "https://lsapi-dev3.zhipuzi.com/pos";
+		m_pingtai_url = "https://pf-api-dev.zhipuzi.com/pos";
+		m_canyin_yewu_url = "https://cyapi-dev.zhipuzi.com/pos";
+		m_lingshou_yewu_url = "https://lsapi-dev.zhipuzi.com/pos";
 	}
 	}
 	else if (m_env == TEST)
 	else if (m_env == TEST)
 	{
 	{

+ 5 - 5
zhipuzi_pos_windows/print/CPosPrinterData.cpp

@@ -706,16 +706,16 @@ std::string CPosPrinterData::PrintWaimaiOrderBiaoqian(CWaimaiOrder& order)
 				}
 				}
 				else
 				else
 				{
 				{
-					if (order.m_is_book == "1")
+					if (order.m_delivertime == CLewaimaiString::UnicodeToUTF8(L"尽快送达"))
 					{
 					{
-						//预约单
-						string date = "配送时间:【预约单】" + CLewaimaiString::UTF8ToANSI(order.m_delivery_date) + "送达";
+						//预约单
+						string date = "配送时间:【即时单】立即送达";
 						textData += BIAOQIAN_TEXTGet(date, 12, nHeightNow, 1, 1);
 						textData += BIAOQIAN_TEXTGet(date, 12, nHeightNow, 1, 1);
 					}
 					}
 					else
 					else
 					{
 					{
-						//预约单
-						string date = "配送时间:【即时单】立即送达";
+						//预约单
+						string date = "配送时间:【预约单】" + CLewaimaiString::UTF8ToANSI(order.m_delivery_date) + "送达";
 						textData += BIAOQIAN_TEXTGet(date, 12, nHeightNow, 1, 1);
 						textData += BIAOQIAN_TEXTGet(date, 12, nHeightNow, 1, 1);
 					}
 					}
 				}
 				}