打印配送上楼

bin/Win32/Release/setup/乐外卖接单软件安装脚本.nsi

@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "乐外卖接单软件"
-!define PRODUCT_VERSION "1.0.5.2"
+!define PRODUCT_VERSION "1.0.5.3"
 !define PRODUCT_PUBLISHER "深圳市迅享科技有限公司"
 !define PRODUCT_WEB_SITE "https://www.lewaimai.com"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"

lewaimai_pos_windows/order/CWaimaiOrder.cpp

@@ -106,6 +106,10 @@ bool CWaimaiOrder::InitData(std::string order_id, std::string order_no)
 
 			m_is_book = CLewaimaiJson::ToString(data["is_book"]);
 
+			m_is_upstairs = CLewaimaiJson::ToString(data["spread_info"]["is_upstairs"]);
+
+			m_is_delivery_upstairs = CLewaimaiJson::ToString(data["spread_info"]["is_delivery_upstairs"]);
+
 			//开始保存订单详情
 			rapidjson::Value& v_rows = data["order_item"];
 

lewaimai_pos_windows/order/CWaimaiOrder.h

@@ -117,5 +117,9 @@ public:
 	std::string m_refund_reason_first; //顾客申请退款的理由
 
 	std::string m_refund_info_status; //最新的退款状态 1顾客申请，等待处理 2：拒绝退款 3：同意退款
+
+	std::string m_is_upstairs; //是否上楼
+
+	std::string m_is_delivery_upstairs; //'是否配送上楼 0全部订单不上楼 1全部订单送上楼 2顾客自己选择是否上楼',
 };
 

lewaimai_pos_windows/tool/CPosPrinter.cpp

@@ -560,6 +560,25 @@ void CPosPrinter::PrintWaimaiOrderShouyin(CWaimaiOrder& order)
 			}
 		}
 
+		//打印是否上楼
+		if (order.m_is_upstairs == "1")
+		{
+			string content = "*** 配送上楼 ***";
+			POS_TextOut(content, true, true, 1);
+
+			POS_FeedLine();
+		}
+		else
+		{
+			if (order.m_is_delivery_upstairs == "1" || order.m_is_delivery_upstairs == "2")
+			{
+				string content = "*** 楼下自提 ***";
+				POS_TextOut(content, true, true, 1);
+
+				POS_FeedLine();
+			}
+		}
+
 		POS_FeedLine();
 
 		//打印取货方式