|
@@ -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);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|