1、修复一个bug

2、更新安装包

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

@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "乐外卖接单软件"
-!define PRODUCT_VERSION "1.0.0.1"
+!define PRODUCT_VERSION "1.0.0.2"
 !define PRODUCT_PUBLISHER "深圳市迅享科技有限公司"
 !define PRODUCT_WEB_SITE "https://www.lewaimai.com"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"
@@ -93,9 +93,35 @@ Function un.onUninstSuccess
   MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) 已成功地从你的计算机移除。"
 FunctionEnd
 
+Function .onInit
+  ;关闭进程
+  Push $R0
+  CheckProc:
+    Push "zhipuzi_pos_windows.exe"
+    ProcessWork::existsprocess
+    Pop $R0
+    IntCmp $R0 0 Done
+    MessageBox MB_OKCANCEL|MB_ICONSTOP "安装程序检测到 ${PRODUCT_NAME} 正在运行。$\r$\n$\r$\n点击 “确定” 强制关闭${PRODUCT_NAME}，继续安装。$\r$\n点击 “取消” 退出安装程序。" IDCANCEL Exit
+    Push "zhipuzi_pos_windows.exe"
+    Processwork::KillProcess
+    Sleep 1000
+    Goto CheckProc
+    Exit:
+    Abort
+    Done:
+    Pop $R0
+FunctionEnd
+
 Function un.onInit
-  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "你确实要完全移除 $(^Name) ，其及所有的组件？" IDYES +2
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "您确实要完全移除 $(^Name) ，及其所有的组件？" IDYES +2
   Abort
+  ;检测程序是否运行
+  FindProcDLL::FindProc "zhipuzi_pos_windows.exe"
+   Pop $R0
+   IntCmp $R0 1 0 no_run
+   MessageBox MB_ICONSTOP "卸载程序检测到 ${PRODUCT_NAME} 正在运行，请关闭之后再卸载！"
+   Quit
+   no_run:
 FunctionEnd
 
 Section Uninstall  

lewaimai_pos_windows/order/CWaimaiOrder.cpp

@@ -94,7 +94,7 @@ bool CWaimaiOrder::InitData(std::string order_id, std::string order_no)
 			m_courier_phone = data["courier_phone"].GetString();
 			//m_receiver_lng = data["receiver_lng"].GetString();
 			//m_receiver_lat = data["receiver_lat"].GetString();
-			m_discount_price = data["discount_price"].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();