订单详情可以进了

bin/Win32/Debug/lewaimai_pos_windows/skin/main.xml

@@ -13,7 +13,7 @@
     		<Control height="2" bkcolor="#FFD1EDFF" />
     		<HorizontalLayout height="90" bkcolor="#FF8DD3FF" bkcolor2="#FF60B1FE">
     			<VerticalLayout width="200">
-    				<Label name="main_name_version" text="乐外卖收银软件" padding="5,5,0,0"/>
+    				<Label name="main_name_version" text="乐外卖接单软件" padding="5,5,0,0"/>
     			</VerticalLayout>
     			<HorizontalLayout childpadding="20" inset="10,16,10,10" >    				
     				<Control />

bin/Win32/Debug/lewaimai_pos_windows/skin/setting.xml

@@ -90,7 +90,7 @@
 
 				<VerticalLayout bkcolor="#FFFFFFFF" padding="0,20,20,20" inset="15,15,15,15">
 					<Control height="300" />
-					<Label text="乐外卖收银软件" align="center">
+					<Label text="乐外卖接单软件" align="center">
 					</Label>
 					<Label name="setting_version" text="版本号：1.0.0.1" align="center">
 					</Label>

bin/Win32/Debug/setup/listen.txt

@@ -1,4 +1,4 @@
-1.本软件为乐外卖收银软件，主要有外卖接单、收银、点餐、会员、核销等功能，可以配合乐外卖微信运营功能使用；
+1.本软件为乐外卖接单软件，主要有外卖接单、收银、点餐、会员、核销等功能，可以配合乐外卖微信运营功能使用；
 
 2.本软件的所有权归深圳市迅享智慧云科技有限公司，任何人不得对本软件进行破解与反编译等侵犯软件著作权的行为；
 

bin/Win32/Debug/setup/智铺子收银软件安装脚本.nsi

@@ -1,7 +1,7 @@
 ; Script generated by the HM NIS Edit Script Wizard.
 
 ; HM NIS Edit Wizard helper defines
-!define PRODUCT_NAME "있棍찡澗陵흡숭"
+!define PRODUCT_NAME "있棍찡쌈데흡숭"
 !define PRODUCT_VERSION "1.1.0.0"
 !define PRODUCT_PUBLISHER "�柏懇祺權옰세唐掘무鱇"
 !define PRODUCT_WEB_SITE "https://www.lewaimai.com"
@@ -35,7 +35,7 @@
 !insertmacro MUI_PAGE_FINISH
 
 Function autostart
-WriteRegStr HKCU Software\Microsoft\Windows\CurrentVersion\Run 있棍찡澗陵흡숭 "$INSTDIR\lewaimai_pos_windows.exe"
+WriteRegStr HKCU Software\Microsoft\Windows\CurrentVersion\Run 있棍찡쌈데흡숭 "$INSTDIR\lewaimai_pos_windows.exe"
 Functionend
 
 ; Uninstaller pages
@@ -64,18 +64,18 @@ Section -AdditionalIcons
   WriteIniStr "$INSTDIR\있棍찡바貢.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
   
   ;戮충우쌥렘駕돨匡숭
-  CreateShortCut "$DESKTOP\있棍찡澗陵흡숭.lnk" "$INSTDIR\lewaimai_pos_windows.exe"
+  CreateShortCut "$DESKTOP\있棍찡쌈데흡숭.lnk" "$INSTDIR\lewaimai_pos_windows.exe"
   CreateShortCut "$DESKTOP\있棍찡바貢.lnk" "$INSTDIR\있棍찡바貢.url" "" "$INSTDIR\icon\lewaimai.ico"
   
   ;역迦넋埼쟁충돨匡숭
-  CreateDirectory "$SMPROGRAMS\있棍찡澗陵흡숭"
-  CreateShortCut "$SMPROGRAMS\있棍찡澗陵흡숭\있棍찡澗陵흡숭.lnk" "$INSTDIR\lewaimai_pos_windows.exe"
-  CreateShortCut "$SMPROGRAMS\있棍찡澗陵흡숭\있棍찡바貢.lnk" "$INSTDIR\있棍찡바貢.url" "" "$INSTDIR\icon\lewaimai.ico"
+  CreateDirectory "$SMPROGRAMS\있棍찡쌈데흡숭"
+  CreateShortCut "$SMPROGRAMS\있棍찡쌈데흡숭\있棍찡쌈데흡숭.lnk" "$INSTDIR\lewaimai_pos_windows.exe"
+  CreateShortCut "$SMPROGRAMS\있棍찡쌈데흡숭\있棍찡바貢.lnk" "$INSTDIR\있棍찡바貢.url" "" "$INSTDIR\icon\lewaimai.ico"
 SectionEnd
 
 Section -Post
   WriteUninstaller "$INSTDIR\uninst.exe"
-  CreateShortCut "$SMPROGRAMS\있棍찡澗陵흡숭\菌潼.lnk" "$INSTDIR\uninst.exe"
+  CreateShortCut "$SMPROGRAMS\있棍찡쌈데흡숭\菌潼.lnk" "$INSTDIR\uninst.exe"
   
   WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\lewaimai_pos_windows.exe"
   
@@ -101,23 +101,23 @@ FunctionEnd
 Section Uninstall  
   RMDir /r "$INSTDIR"
 
-  Delete "$DESKTOP\있棍찡澗陵흡숭.lnk"
+  Delete "$DESKTOP\있棍찡쌈데흡숭.lnk"
   Delete "$DESKTOP\있棍찡바貢.lnk"
   
   SetShellVarContext current
-  Delete "$SMPROGRAMS\있棍찡澗陵흡숭\菌潼.lnk"
-  Delete "$SMPROGRAMS\있棍찡澗陵흡숭\있棍찡바貢.lnk"
-  Delete "$SMPROGRAMS\있棍찡澗陵흡숭\있棍찡澗陵흡숭.lnk"
-  RMDir "$SMPROGRAMS\있棍찡澗陵흡숭"
+  Delete "$SMPROGRAMS\있棍찡쌈데흡숭\菌潼.lnk"
+  Delete "$SMPROGRAMS\있棍찡쌈데흡숭\있棍찡바貢.lnk"
+  Delete "$SMPROGRAMS\있棍찡쌈데흡숭\있棍찡쌈데흡숭.lnk"
+  RMDir "$SMPROGRAMS\있棍찡쌈데흡숭"
   
   SetShellVarContext all
-  Delete "$SMPROGRAMS\있棍찡澗陵흡숭\菌潼.lnk"
-  Delete "$SMPROGRAMS\있棍찡澗陵흡숭\있棍찡바貢.lnk"
-  Delete "$SMPROGRAMS\있棍찡澗陵흡숭\있棍찡澗陵흡숭.lnk"
-  RMDir "$SMPROGRAMS\있棍찡澗陵흡숭"
+  Delete "$SMPROGRAMS\있棍찡쌈데흡숭\菌潼.lnk"
+  Delete "$SMPROGRAMS\있棍찡쌈데흡숭\있棍찡바貢.lnk"
+  Delete "$SMPROGRAMS\있棍찡쌈데흡숭\있棍찡쌈데흡숭.lnk"
+  RMDir "$SMPROGRAMS\있棍찡쌈데흡숭"
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
   DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
-  DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "있棍찡澗陵흡숭"
+  DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "있棍찡쌈데흡숭"
   SetAutoClose true
 SectionEnd

lewaimai_pos_windows/control/CWaimaiOrderInfoUI.cpp

@@ -173,20 +173,6 @@ void CWaimaiOrderInfoUI::Refresh(CWaimaiOrder& order)
 		fees_num++;
 	}
 
-	//商品券
-	if (atof(order.m_goods_coupon_value.c_str()) > 0.0001)
-	{
-		CLabelUI *pGoodsCoupon = new CLabelUI;
-		pGoodsCoupon->SetFixedHeight(30);
-
-		wstring goods_coupon = L"商品券：-" + CLewaimaiString::UTF8ToUnicode(order.m_goods_coupon_value);
-		pGoodsCoupon->SetText(goods_coupon.c_str());
-
-		pFeesLayout->Add(pGoodsCoupon);
-
-		fees_num++;
-	}
-
 	int fees_height;
 	if (fees_num == 0)
 	{
@@ -236,19 +222,7 @@ void CWaimaiOrderInfoUI::Refresh(CWaimaiOrder& order)
 		std::wstring qishou_phone = L"骑手电话：" + CLewaimaiString::UTF8ToUnicode(order.m_courier_phone);
 		this->FindSubControl(_T("waimai_order_info_page_qishou_phone"))->SetText(qishou_phone.c_str());
 
-		std::wstring qishou_type;
-		if (order.m_courier_type == "3")
-		{
-			qishou_type = L"骑手类型：快服务骑手";
-		}
-		else if (order.m_courier_type == "5")
-		{
-			qishou_type = L"骑手类型：达达骑手";
-		}
-		else
-		{
-			qishou_type = L"骑手类型：商家自配送骑手";
-		}
+		std::wstring qishou_type = L"骑手类型：商家自配送骑手";
 
 		this->FindSubControl(_T("waimai_order_info_page_qishou_type"))->SetText(qishou_type.c_str());
 	}
@@ -261,7 +235,7 @@ void CWaimaiOrderInfoUI::Refresh(CWaimaiOrder& order)
 	if (order.m_is_selftake == "1")
 	{
 		CLabelUI *pDeliveryType = static_cast<CLabelUI *>(this->FindSubControl(_T("waimai_order_info_page_delivery_type")));
-		wstring wsDeliveryType = _T("配送方式：到店自取（取餐号：") + CLewaimaiString::UTF8ToUnicode(order.m_take_food_code) + _T("）");
+		wstring wsDeliveryType = _T("配送方式：到店自取");
 		pDeliveryType->SetText(wsDeliveryType.c_str());
 	}
 	else

lewaimai_pos_windows/helper/CSystem.h

@@ -50,7 +50,7 @@ public:
             GetModuleFileName(NULL, strExeFullDir, MAX_PATH);
 
             //3、添加一个子Key,并设置值，"GISRestart"是应用程序名字（不加后缀.exe）
-            RegSetValueEx(hKey, L"乐外卖收银软件", 0, REG_SZ, (LPBYTE)strExeFullDir, (lstrlen(strExeFullDir) + 1) * sizeof(TCHAR));
+            RegSetValueEx(hKey, L"乐外卖接单软件", 0, REG_SZ, (LPBYTE)strExeFullDir, (lstrlen(strExeFullDir) + 1) * sizeof(TCHAR));
 
             //4、关闭注册表
             RegCloseKey(hKey);
@@ -72,7 +72,7 @@ public:
         if(RegOpenKeyEx(HKEY_CURRENT_USER, strRegPath.c_str(), 0, KEY_ALL_ACCESS, &hKey) == ERROR_SUCCESS)
         {
             //2、删除值
-            RegDeleteValue(hKey, L"乐外卖收银软件");
+            RegDeleteValue(hKey, L"乐外卖接单软件");
 
             //3、关闭注册表
             RegCloseKey(hKey);

lewaimai_pos_windows/lewaimai_pos_windows.cpp

@@ -41,7 +41,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
         return 0;
     }
 
-    pLogin->Create(NULL, _T("乐外卖收银软件登录"), UI_WNDSTYLE_DIALOG, 0, 0, 0, 0, 0, NULL);
+    pLogin->Create(NULL, _T("乐外卖接单软件登录"), UI_WNDSTYLE_DIALOG, 0, 0, 0, 0, 0, NULL);
     pLogin->SetIcon(IDI_ICON_DUILIB);
     pLogin->CenterWindow();
     pLogin->ShowModal();

lewaimai_pos_windows/order/CWaimaiOrder.cpp

@@ -18,7 +18,7 @@ void CWaimaiOrder::InitData(std::string order_id, std::string order_no)
 	params["order_no"] = order_no;
 
 	std::string response;
-	bool ret = CLewaimaiHttpClient::Request("/waimaiorder/getorderdetail", params, response);
+	bool ret = CLewaimaiHttpClient::Request("/order/getorderrow", params, response);
 	if (!ret)
 	{
 		LOG_INFO("网络请求出错");
@@ -60,67 +60,48 @@ void CWaimaiOrder::InitData(std::string order_id, std::string order_no)
 			m_promotion = data["promotion"].GetString();
 			m_is_member_discount = data["is_member_discount"].GetString();
 			m_member_discount = data["member_discount"].GetString();
-			m_discount = data["discount"].GetFloat();
-			m_coupon = data["coupon"].GetFloat();
-			m_delivery = data["delivery"].GetFloat();
-			m_price = data["price"].GetFloat();
+			m_discount = atof(data["discount"].GetString());
+			m_coupon = atof(data["coupon"].GetString());
+			m_delivery = atof(data["delivery"].GetString());
+			m_price = atof(data["price"].GetString());
 			m_order_date = data["order_date"].GetString();
-			m_order_fields = data["order_fields"].GetString();
 			m_order_status = data["order_status"].GetString();
 			m_courier_id = data["courier_id"].GetString();
 			m_is_selftake = data["is_selftake"].GetString();
 			//m_addservice_text = data["addservice_text"].GetString();
 			m_is_dabao = data["is_dabao"].GetString();
 			m_dabao_money = data["dabao_money"].GetString();
-			m_phone_customer_id = data["phone_customer_id"].GetString();
+			//m_phone_customer_id = data["phone_customer_id"].GetString();
 			m_order_num = data["order_num"].GetString();
 			m_from_type = data["from_type"].GetString();
 			m_is_refund = data["is_refund"].GetString();
 			m_refund_status = data["refund_status"].GetString();
 			m_is_pickup = data["is_pickup"].GetString();
 			m_pickup_time = data["pickup_time"].GetString();
-			m_verify_time = data["verify_time"].GetString();
-			m_verify_user = data["verify_user"].GetString();
+			//m_verify_time = data["verify_time"].GetString();
+			//m_verify_user = data["verify_user"].GetString();
 			m_refund_failed_reason = data["refund_failed_reason"].GetString();
 			m_refund_time = data["refund_time"].GetString();
 			m_failed_reason = data["failed_reason"].GetString();
 			m_configmemo = data["configmemo"].GetString();
-			m_courier_type = data["courier_type"].GetString();
+			//m_courier_type = data["courier_type"].GetString();
 			m_courier_name = data["courier_name"].GetString();
 			m_courier_phone = data["courier_phone"].GetString();
-			m_receiver_lng = data["receiver_lng"].GetString();
-			m_receiver_lat = data["receiver_lat"].GetString();
-			m_reduction_value = data["reduction_value"].GetString();
-			m_price_moling = data["price_moling"].GetString();
-			m_price_plus = data["price_plus"].GetString();
+			//m_receiver_lng = data["receiver_lng"].GetString();
+			//m_receiver_lat = data["receiver_lat"].GetString();
 			m_discount_price = data["discount_price"].GetString();
 			m_order_no = data["order_no"].GetString();
 			m_is_firstcut = data["is_firstcut"].GetString();
 			m_firstcut_value = data["firstcut_value"].GetString();
-			m_goods_coupon_value = data["goods_coupon_value"].GetString();
-			m_take_food_code = data["take_food_code"].GetString();
 			m_need_to_refund = data["need_to_refund"].GetString();
 
-			m_is_nowprinter = data["is_nowprinter"].GetInt();
-
 			m_shop_name = data["shop_name"].GetString();
 			m_longitude = data["longitude"].GetString();
 			m_latitude = data["latitude"].GetString();
 			m_open_selftake = data["open_selftake"].GetString();
-			m_invitetimetimerange = data["invitetimetimerange"].GetString();
-			m_machine_qrcode_open = data["machine_qrcode_open"].GetString();
-			m_machine_qrcode_url = data["machine_qrcode_url"].GetString();
-			m_machine_qrcode_title = data["machine_qrcode_title"].GetString();
 			m_delivery_date = data["delivery_date"].GetString();
-			m_head_picture = data["head_picture"].GetString();
-			m_courier = data["courier"].GetString();
-			m_delivertime = data["delivertime"].GetString();
-			m_customer_order_total = data["customer_order_total"].GetString();
 
-			m_invoice = data["invoice"].GetInt();
-
-			m_invoice_type = data["invoice_type"].GetString();
-			m_tax_payer_id = data["tax_payer_id"].GetString();
+			m_customer_order_total = data["customer_order_total"].GetString();
 
 			//开始保存订单详情
 			rapidjson::Value& v_rows = data["order_item"];
@@ -130,17 +111,12 @@ void CWaimaiOrder::InitData(std::string order_id, std::string order_no)
 				rapidjson::Value& v_row_i = v_rows[i];
 
 				CWaimaiOrderItem newItem;
-				newItem.m_id = v_row_i["id"].GetString();
 				newItem.m_food_name = v_row_i["food_name"].GetString();
 				newItem.m_item_price = v_row_i["item_price"].GetString();
 				newItem.m_quantity = v_row_i["quantity"].GetString();
-				newItem.m_type_id = v_row_i["type_id"].GetString();
+				//newItem.m_type_id = v_row_i["type_id"].GetString();
 				newItem.m_foodpackage_id = v_row_i["foodpackage_id"].GetString();
 				newItem.m_is_foodpackage = v_row_i["is_foodpackage"].GetString();
-				newItem.m_food_unit = v_row_i["food_unit"].GetString();
-				newItem.m_order_item_id = v_row_i["order_item_id"].GetString();
-				newItem.m_food_id = v_row_i["food_id"].GetString();
-				newItem.m_barcode = v_row_i["barcode"].GetString();
 
 				m_order_items.push_back(newItem);
 			}
@@ -178,11 +154,11 @@ void CWaimaiOrder::InitData(std::string order_id, std::string order_no)
 
 bool CWaimaiOrder::ConfirmeOrder(std::string order_id)
 {
-	std::string url = "/waimaiorder/orderconfirm";
+	std::string url = "/order/orderconfirm";
 
 	//请求外卖的未处理订单
 	std::map<string, string> params;
-	params["id"] = order_id;
+	params["ids"] = order_id;
 	std::string response;
 
 	CLewaimaiHttpClient::Request(url.c_str(), params, response);
@@ -220,11 +196,11 @@ bool CWaimaiOrder::ConfirmeOrder(std::string order_id)
 
 bool CWaimaiOrder::SuccessOrder(std::string order_id)
 {
-	std::string url = "/waimaiorder/ordersucceeded";
+	std::string url = "/order/ordersucceeded";
 
 	//请求外卖的未处理订单
 	std::map<string, string> params;
-	params["id"] = order_id;
+	params["ids"] = order_id;
 	std::string response;
 
 	CLewaimaiHttpClient::Request(url.c_str(), params, response);
@@ -266,7 +242,7 @@ bool CWaimaiOrder::FailOrder(std::string order_id, std::string reason)
 
 	//请求外卖的未处理订单
 	std::map<string, string> params;
-	params["id"] = order_id;
+	params["ids"] = order_id;
 	params["failed_reason"] = reason;
 	std::string response;
 
@@ -305,7 +281,7 @@ bool CWaimaiOrder::FailOrder(std::string order_id, std::string reason)
 
 bool CWaimaiOrder::AgreeRefund(std::string order_id)
 {
-	std::string url = "/waimaiorder/agreerefund";
+	std::string url = "/order/agreerefund";
 
 	//请求外卖的未处理订单
 	std::map<string, string> params;
@@ -347,7 +323,7 @@ bool CWaimaiOrder::AgreeRefund(std::string order_id)
 
 bool CWaimaiOrder::DisagreeRefund(std::string order_id)
 {
-	std::string url = "/waimaiorder/disagreerefund";
+	std::string url = "/order/disagreerefund";
 
 	//请求外卖的未处理订单
 	std::map<string, string> params;

lewaimai_pos_windows/order/CWaimaiOrder.h

@@ -6,17 +6,12 @@
 class CWaimaiOrderItem
 {
 public:
-	std::string m_id;
 	std::string m_food_name;
 	std::string m_item_price;
 	std::string m_quantity;
-	std::string m_type_id;
+	//std::string m_type_id;
 	std::string m_foodpackage_id;
 	std::string m_is_foodpackage;
-	std::string m_food_unit;
-	std::string m_order_item_id;
-	std::string m_food_id;
-	std::string m_barcode;
 };
 
 class CWaimaiOrderField
@@ -61,62 +56,43 @@ public:
 	double m_price;
 
 	std::string m_order_date;
-	std::string m_order_fields;
 	std::string m_order_status;
 	std::string m_courier_id;
 	std::string m_is_selftake;
 	std::string m_addservice_text;
 	std::string m_is_dabao;
 	std::string m_dabao_money;
-	std::string m_phone_customer_id;
+	//std::string m_phone_customer_id;
 	std::string m_order_num;
 	std::string m_from_type;
 	std::string m_is_refund;
 	std::string m_refund_status;
 	std::string m_is_pickup;
 	std::string m_pickup_time;
-	std::string m_verify_time;
-	std::string m_verify_user;
+	//std::string m_verify_time;
+	//std::string m_verify_user;
 	std::string m_refund_failed_reason;
 	std::string m_refund_time;
 	std::string m_failed_reason;
 	std::string m_configmemo;
-	std::string m_courier_type;
+	//std::string m_courier_type;
 	std::string m_courier_name;
 	std::string m_courier_phone;
-	std::string m_receiver_lng;
-	std::string m_receiver_lat;
-	std::string m_reduction_value;
-	std::string m_price_moling;
-	std::string m_price_plus;
+	//std::string m_receiver_lng;
+	//std::string m_receiver_lat;
 	std::string m_discount_price;
 	std::string m_order_no;
 	std::string m_is_firstcut;
 	std::string m_firstcut_value;
-	std::string m_goods_coupon_value;
-	std::string m_take_food_code;
 	std::string m_need_to_refund;
 
-	int m_is_nowprinter;
-
 	std::string m_shop_name;
 	std::string m_longitude;
 	std::string m_latitude;
 	std::string m_open_selftake;
-	std::string m_invitetimetimerange;
-	std::string m_machine_qrcode_open;
-	std::string m_machine_qrcode_url;
-	std::string m_machine_qrcode_title;
 	std::string m_delivery_date;
-	std::string m_head_picture;
-	std::string m_courier;
-	std::string m_delivertime;
-	std::string m_customer_order_total;
 
-	int m_invoice;
-
-	std::string m_invoice_type;
-	std::string m_tax_payer_id;
+	std::string m_customer_order_total;
 
 	std::vector<CWaimaiOrderItem> m_order_items;
 	std::vector<CWaimaiOrderField> m_order_field;

lewaimai_pos_windows/tool/CPosPrinter.cpp

@@ -92,9 +92,6 @@ void CPosPrinter::PrintWaimaiOrderShouyin(CWaimaiOrder& order)
             POS_FeedLine();
 
             POS_FeedLine();
-
-            POS_TextOut("取餐号：" + CLewaimaiString::UTF8ToANSI(order.m_take_food_code), true, 1);
-            POS_FeedLine();
         }
 
         else
@@ -339,15 +336,6 @@ void CPosPrinter::PrintWaimaiOrderShouyin(CWaimaiOrder& order)
             is_other_money = true;
         }
 
-        if(atof(order.m_goods_coupon_value.c_str()) > 0.0001)
-        {
-            string coupon = "商品券：-" + order.m_goods_coupon_value;
-            POS_TextOut(coupon, false, 0);
-            POS_FeedLine();
-
-            is_other_money = true;
-        }
-
         if(is_other_money)
         {
             POS_TextOut(lines);
@@ -420,11 +408,11 @@ void CPosPrinter::PrintWaimaiOrderChufang(CWaimaiOrder& order)
 
             for(std::vector<CWaimaiOrderItem>::iterator it = order.m_order_items.begin(); it != order.m_order_items.end(); it++)
             {
-                if(ids_map.find((*it).m_type_id) != ids_map.end())
-                {
-                    //如果当前商品的分类，在厨房打印机设置的分类里面，才加入
-                    cur_printer_use.push_back(*it);
-                }
+                //if(ids_map.find((*it).m_type_id) != ids_map.end())
+                //{
+                //    //如果当前商品的分类，在厨房打印机设置的分类里面，才加入
+                //    cur_printer_use.push_back(*it);
+                //}
             }
         }
 

lewaimai_pos_windows/wnd/CLoginWnd.cpp

@@ -5,7 +5,7 @@
 void CLoginWnd::Init()
 {
 	CLabelUI* version = static_cast<CLabelUI*>(m_pm.FindControl(_T("login_version")));
-	version->SetText((L"있棍찡澗陵흡숭 " + CLewaimaiString::UTF8ToUnicode(CSystem::GetVersion())).c_str());
+	version->SetText((L"있棍찡쌈데흡숭 " + CLewaimaiString::UTF8ToUnicode(CSystem::GetVersion())).c_str());
 
 	std::map<string, string> users = CSetting::getUsers();
 
@@ -477,7 +477,7 @@ void CLoginWnd::LoginSuccess()
 	}
 
 	pFrame->SetIcon(IDI_ICON_DUILIB);
-	pFrame->Create(NULL, _T("있棍찡澗陵흡숭"), UI_WNDSTYLE_FRAME, 0L, 0, 0, 1024, 768);
+	pFrame->Create(NULL, _T("있棍찡쌈데흡숭"), UI_WNDSTYLE_FRAME, 0L, 0, 0, 1024, 768);
 	pFrame->CenterWindow();
 
 	::ShowWindow(*pFrame, SW_SHOWMAXIMIZED);

lewaimai_pos_windows/wnd/CMainWnd.cpp

@@ -731,7 +731,7 @@ void CMainWnd::HandleClickMsg(TNotifyUI& msg)
 		{
 			return;
 		}
-		pLogin->Create(NULL, _T("乐外卖收银软件登录"), UI_WNDSTYLE_DIALOG, 0, 0, 0, 0, 0, NULL);
+		pLogin->Create(NULL, _T("乐外卖接单软件登录"), UI_WNDSTYLE_DIALOG, 0, 0, 0, 0, 0, NULL);
 		pLogin->SetIcon(IDI_ICON_DUILIB);
 		pLogin->CenterWindow();
 
@@ -1187,7 +1187,7 @@ void CMainWnd::AddTrayIcon()
     m_trayIcon.cbSize = sizeof(NOTIFYICONDATA);
     m_trayIcon.hIcon = ::LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_ICON_DUILIB));
     m_trayIcon.hWnd = m_hWnd;
-    lstrcpy(m_trayIcon.szTip, _T("乐外卖收银软件"));
+    lstrcpy(m_trayIcon.szTip, _T("乐外卖接单软件"));
     m_trayIcon.uCallbackMessage = WM_SHOWTASK;
     m_trayIcon.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
 
@@ -1247,7 +1247,7 @@ LRESULT CMainWnd::OnOrderlistRefresh(UINT uMsg, WPARAM wParam, LPARAM lParam, BO
 void CMainWnd::InitSettingStatus()
 {
 	CLabelUI* name_version = static_cast<CLabelUI*>(m_pm.FindControl(_T("main_name_version")));
-	name_version->SetText((L"乐外卖收银软件 " + CLewaimaiString::UTF8ToUnicode(CSystem::GetVersion())).c_str());
+	name_version->SetText((L"乐外卖接单软件 " + CLewaimaiString::UTF8ToUnicode(CSystem::GetVersion())).c_str());
 
 	CLabelUI* version = static_cast<CLabelUI*>(m_pm.FindControl(_T("setting_version")));
 	version->SetText((L"版本号：" + CLewaimaiString::UTF8ToUnicode(CSystem::GetVersion())).c_str());

lewaimai_pos_windows_server/helper/CSystem.h

@@ -28,7 +28,7 @@ public:
 			GetModuleFileName(NULL, strExeFullDir, MAX_PATH);
 
 			//3、添加一个子Key,并设置值，"GISRestart"是应用程序名字（不加后缀.exe）
-			RegSetValueEx(hKey, L"乐外卖收银软件", 0, REG_SZ, (LPBYTE)strExeFullDir, (lstrlen(strExeFullDir) + 1) * sizeof(TCHAR));
+			RegSetValueEx(hKey, L"乐外卖接单软件", 0, REG_SZ, (LPBYTE)strExeFullDir, (lstrlen(strExeFullDir) + 1) * sizeof(TCHAR));
 
 			//4、关闭注册表
 			RegCloseKey(hKey);
@@ -50,7 +50,7 @@ public:
 		if (RegOpenKeyEx(HKEY_CURRENT_USER, strRegPath.c_str(), 0, KEY_ALL_ACCESS, &hKey) == ERROR_SUCCESS)
 		{
 			//2、删除值
-			RegDeleteValue(hKey, L"乐外卖收银软件");
+			RegDeleteValue(hKey, L"乐外卖接单软件");
 
 			//3、关闭注册表
 			RegCloseKey(hKey);