升级版本到1.0.3.6

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

@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "逐趣校园接单软件"
-!define PRODUCT_VERSION "1.0.3.4"
+!define PRODUCT_VERSION "1.0.3.6"
 !define PRODUCT_PUBLISHER "深圳市迅享生活科技有限公司"
 !define PRODUCT_WEB_SITE "https://www.zhuquxiaoyuan.com"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"

lewaimai_pos_windows/network/CLewaimaiHttpClient.cpp

@@ -83,6 +83,7 @@ bool CLewaimaiHttpClient::Login(std::string& errmsg)
 
 		//店铺ID默认为0
 		m_client.m_shop_id = "0";
+		m_client.m_shop_ids = "";
 
 		rapidjson::Value& v_rows = data["shop_ids"];
 
@@ -93,10 +94,12 @@ bool CLewaimaiHttpClient::Login(std::string& errmsg)
 			std::string shop_id = v_row_i.GetString();
 
 			m_client.m_shop_id = shop_id;
+
+			m_client.m_shop_ids += shop_id + ",";
 		}
-	}
 
-	//LOG_INFO("login success!");
+		m_client.m_shop_ids = m_client.m_shop_ids.substr(0, m_client.m_shop_ids.length() - 1);
+	}
 	
 	return true;
 }
@@ -158,10 +161,15 @@ bool CLewaimaiHttpClient::Request(std::string url, std::map<string, string> para
 
 	//LOG_INFO("postString:" << postString.c_str());
 
+	int a = 0;
+
 	CHttpClient m_httpClient;
 	int ret = m_httpClient.Posts(m_client.m_url + url, postString, response, NULL);
 
-	//LOG_INFO("response:" << response.c_str());
+	if (url == "/goodstype/getlist")
+	{
+		LOG_INFO("response:" << response.c_str());
+	}
 
 	if (ret == 0)
 	{
@@ -181,3 +189,8 @@ std::string CLewaimaiHttpClient::getShopId()
 {
 	return m_client.m_shop_id;
 }
+
+std::string CLewaimaiHttpClient::getShopIdS()
+{
+	return m_client.m_shop_ids;
+}

lewaimai_pos_windows/network/CLewaimaiHttpClient.h

@@ -17,6 +17,8 @@ public:
 
 	static std::string getShopId();
 
+	static std::string getShopIdS();
+
 public:
 	static CLewaimaiHttpClient m_client;
 
@@ -28,5 +30,8 @@ private:
 
 	//这个是当前登陆的账号对应的店铺ID（如果是连锁店账号就是返回的第一个店铺），主要用于厨房打印的分类打印时候用于获取商品分类
 	std::string m_shop_id;
+
+	//如果是连锁店账号，这个用来存储多个店铺ID
+	std::string m_shop_ids;
 };
 

lewaimai_pos_windows/tool/CPosPrinter.cpp

@@ -1191,6 +1191,9 @@ void CPosPrinter::PrintWaimaiOrderChufang(CWaimaiOrder& order)
             POS_TextOut("派工单", true, true, 1);
             POS_FeedLine();
 
+			POS_TextOut(CLewaimaiString::UTF8ToANSI(order.m_shop_name), false, false, 1);
+			POS_FeedLine();
+
             POS_FeedLine();
 
             string order_type = "#" + order.m_restaurant_number + "  ";
@@ -1210,6 +1213,16 @@ void CPosPrinter::PrintWaimaiOrderChufang(CWaimaiOrder& order)
                 POS_FeedLine();
             }
 
+			if (order.m_is_book == "1")
+			{
+				//预约单
+				string date = "【预约单】" + CLewaimaiString::UTF8ToANSI(order.m_delivery_date);
+				POS_TextOut(date, false, true);
+				POS_TextOut("送达", false, false);
+
+				POS_FeedLine();
+			}
+
             //预设选项
             if(order.m_order_field.size() > 1)
             {

lewaimai_pos_windows/wnd/CMainWnd.cpp

@@ -1942,7 +1942,7 @@ void CMainWnd::InitSettingStatus()
     //先清空一次分类（主要考虑退出登陆重新登录的情况）
     CSetting::ClearFoodtype();
 
-	std::string shop_id = CLewaimaiHttpClient::getShopId();
+	std::string shop_id = CLewaimaiHttpClient::getShopIdS();
 	if (shop_id != "0")
 	{
 		std::map<string, string> params;
@@ -1988,7 +1988,8 @@ void CMainWnd::InitSettingStatus()
 			rapidjson::Value& v_row_i = v_rows[i];
 
 			std::string type_id = v_row_i["type_id"].GetString();
-			std::string name = v_row_i["name"].GetString();
+			std::string shopname = v_row_i["shopname"].GetString();
+			std::string name = CLewaimaiString::UnicodeToUTF8(L"【") + shopname + CLewaimaiString::UnicodeToUTF8(L"】") + v_row_i["name"].GetString();
 
 			CSetting::AddFoodtype(name, type_id);
 		}