feat<central_clearing_system>:完成下单流程、打印和菜单配置，未联调

liuye
1 parent e6beff82
Showing 26 changed files with 826 additions and 209 deletions
central_clearing_system/Config/menu_res_auth_cfg.json
central_clearing_system/Config/menu_res_auth_cfg.json--
central_clearing_system/Config/menu_res_auth_cfg.json---
central_clearing_system/Config/url_cfg.json
central_clearing_system/Config/url_cfg.json---
central_clearing_system/ETradeClient.rc
central_clearing_system/ETradeClient/browser/async_js_callback_handler.cpp
central_clearing_system/ETradeClient/hardware/hardware_cmd.cpp
central_clearing_system/ETradeClient/hardware/hardware_cmd.h
central_clearing_system/ETradeClient/mfc_ui/ETradeClient.cpp
central_clearing_system/ETradeClient/mfc_ui/GridCellBase.cpp
central_clearing_system/ETradeClient/mfc_ui/GridCellBase.h
central_clearing_system/ETradeClient/mfc_ui/GridCtrl.cpp
central_clearing_system/ETradeClient/mfc_ui/GridCtrl.h
central_clearing_system/ETradeClient/mfc_ui/MainFrm.cpp
central_clearing_system/ETradeClient/mfc_ui/etrade_edit_control.cpp
central_clearing_system/ETradeClient/mfc_ui/pay_dlg.cpp
central_clearing_system/ETradeClient/mfc_ui/pay_dlg.h
central_clearing_system/ETradeClient/mfc_ui/place_order_dlg.cpp
central_clearing_system/ETradeClient/mfc_ui/place_order_dlg.h
@@ -3,10 +3,22 @@
     {"res_id":10001, 	"auth_id":100001,     "icon":"trade.ico", 		"index":[0, 0]},
 	{"res_id":10002, 	"auth_id":100002,     "icon":"place_an_order.ico", 		"index":[0, 1]},
 	{"res_id":10003, 	"auth_id":100003,     "icon":"statement_manage.ico", 		"index":[0, 2]},
-	{"res_id":10004, 	"auth_id":100004,     "icon":"order_manage.ico", 		"index":[0, 3]},
 	{"res_id":2, 		"auth_id":1010, 	  "icon":"", 				"index":[1]},
     {"res_id":20001, 	"auth_id":101001,     "icon":"user_manage.ico", 		"index":[1, 0]},
 	{"res_id":20002, 	"auth_id":101002,     "icon":"role_manage.ico", 		"index":[1, 1]},
+	{"res_id":20003, 	"auth_id":101002,     "icon":"role_manage.ico", 		"index":[1, 1]},
+	{"res_id":30001, 	"auth_id":103001,     "icon":"role_manage.ico", 		"index":[2]},
+	{"res_id":4, 		"auth_id":1020, 	  "icon":"", 				"index":[3]},
+	{"res_id":40001, 	"auth_id":102001,     "icon":"user_manage.ico", 		"index":[3, 0]},
+	{"res_id":40002, 	"auth_id":102002,     "icon":"user_manage.ico", 		"index":[3, 1]},
+	{"res_id":40003, 	"auth_id":102003,     "icon":"user_manage.ico", 		"index":[3, 2]},
+	{"res_id":40004, 	"auth_id":102004,     "icon":"user_manage.ico", 		"index":[3, 3]},
+	{"res_id":40005, 	"auth_id":102005,     "icon":"user_manage.ico", 		"index":[3, 4]},
+	{"res_id":5, 		"auth_id":1040, 	  "icon":"", 				"index":[4]},
+	{"res_id":50001, 	"auth_id":104001,     "icon":"user_manage.ico", 		"index":[4, 0]},
+	{"res_id":50002, 	"auth_id":104002,     "icon":"user_manage.ico", 		"index":[4, 1]},
+	{"res_id":50003, 	"auth_id":104003,     "icon":"user_manage.ico", 		"index":[4, 2]},
+	{"res_id":50004, 	"auth_id":104004,     "icon":"user_manage.ico", 		"index":[4, 3]},
 	{"res_id":11001, 	"auth_id":0,     "icon":"exit.ico", 		"index":[]},
 	{"res_id":11002, 	"auth_id":0,     "icon":"modify_account_pwd.ico", 		"index":[]}
 ]
 \ No newline at end of file
-[
-    {"res_id":1, 		"auth_id":1000, 	  "icon":"", 				"index":[0]},
-    {"res_id":10001, 	"auth_id":100001,     "icon":"about.ico", 		"index":[0, 0]},
-	{"res_id":10002, 	"auth_id":100002,     "icon":"about.ico", 		"index":[0, 1]},
-	{"res_id":10003, 	"auth_id":100003,     "icon":"about.ico", 		"index":[0, 2]},
-	{"res_id":10004, 	"auth_id":100004,     "icon":"about.ico", 		"index":[0, 3]},
-	{"res_id":2, 		"auth_id":1010, 	  "icon":"", 				"index":[1]},
-    {"res_id":20001, 	"auth_id":101001,     "icon":"about.ico", 		"index":[1, 0]},
-	{"res_id":20002, 	"auth_id":101002,     "icon":"about.ico", 		"index":[1, 1]},
-	{"res_id":20003, 	"auth_id":101003,     "icon":"about.ico", 		"index":[1, 2]}
-]
 \ No newline at end of file
-[
-    {"res_id":1, 		"auth_id":1000, 	  "icon":"", 				"index":[0]},
-    {"res_id":10001, 	"auth_id":100001,     "icon":"trade.ico", 		"index":[0, 0]},
-	{"res_id":10002, 	"auth_id":100002,     "icon":"place_an_order.ico", 		"index":[0, 1]},
-	{"res_id":10003, 	"auth_id":100003,     "icon":"statement_manage.ico", 		"index":[0, 2]},
-	{"res_id":10004, 	"auth_id":100004,     "icon":"order_manage.ico", 		"index":[0, 3]},
-	{"res_id":2, 		"auth_id":1010, 	  "icon":"", 				"index":[1]},
-    {"res_id":20001, 	"auth_id":101001,     "icon":"user_manage.ico", 		"index":[1, 0]},
-	{"res_id":20002, 	"auth_id":101002,     "icon":"role_manage.ico", 		"index":[1, 1]}
-]
 \ No newline at end of file
 {
 	"protocol": "http",
-	"host": "shop.esc.diligrp.com",
+	"host": "xtrade.esc.diligrp.com",
 	"port": 80,
 	"main_path": "/iset/oauth/clientInitMain.iset",
     "login_path": "/iset/oauth/login.auth",
@@ -8,5 +8,10 @@
     "menu_auth_path":"/iset/oauth/loadUserPermission.iset", 
     "user_msg_count_path":"", 
     "user_msg_path":"",
-    "modify_pwd_path":"/iset/oauth/initChangePwd.iset"
+    "modify_pwd_path":"/iset/oauth/initChangePwd.iset",
+	"get_card_name_path":"/iset/product/buyerQuery.iset",
+	"get_seller_card_path":"/iset/product/sellerQuery.iset",
+	"get_product_name_path":"/iset/product/productQuery.iset",
+	"submit_orders_path":"/iset/product/submitStatement.iset",
+	"finish_order_path":"/iset/product/finishStatement.iset"
 }
 \ No newline at end of file
-{
-	"protocol": "http",
-	"host": "card.esc.diligrp.com",
-	"port": 0,
-	"main_path": "/user/clientInitMain.page",
-	"login_path": "/counter/authorizeCounter.auth",
-	"logout_path": "/user/doLogout.auth",
-	"menu_auth_path":"/counter/loadPermission.do", 
-	"user_msg_count_path":"/message/countUserMessage.do", 
-	"user_msg_path":"/message/userMessageInit.page",
-	"modify_pwd_path":"/employee/client/initModifyPassword.page"
-}
 \ No newline at end of file
@@ -77,17 +77,33 @@ IDR_MAINFRAME           ICON                    &quot;res\\ETradeClient.ico&quot;
 IDR_MAINFRAME MENU
 BEGIN
-    POPUP "中央结算(&Z)"
+    POPUP "中央结算"
     BEGIN
-        MENUITEM "缴费(&J)",                      ID_PAY_FEE
-        MENUITEM "下单(&X)",                      ID_ORDER
-        MENUITEM "结算单管理(&S)",                   ID_STATEMENT_MANAGE
-        MENUITEM "订单管理(&D)",                    ID_ORDERFORM_MANAGE
+        MENUITEM "下单",                          ID_ORDER
+        MENUITEM "结算单管理",                       ID_STATEMENT_MANAGE
+        MENUITEM "订单管理",                        ID_ORDERFORM_MANAGE
     END
-    POPUP "系统设置(&A)"
+    POPUP "登记分发"
     BEGIN
-        MENUITEM "用户管理(&B)",                    ID_USER_MANAGE
-        MENUITEM "角色管理(&C)",                    ID_ROLE_MANAGE
+        MENUITEM "商品登记",                        ID_COMM_REGIST
+        MENUITEM "商品分发",                        ID_COMM_DISTRIB
+        MENUITEM "查询管理",                        ID_QUERY_MANAGE
+    END
+    MENUITEM "特殊处理",                        ID_SPECIAL_HANDLE
+    POPUP "基础资料"
+    BEGIN
+        MENUITEM "扣点规则",                        ID_POINT_RULE
+        MENUITEM "品类管理",                        ID_CATEGORY_RULE
+        MENUITEM "免密协议",                        ID_AGREEMENT
+        MENUITEM "代卖货管理",                       ID_TAPE_HANDLE
+        MENUITEM "赊销授信管理",                      ID_CREDIT
+    END
+    POPUP "系统设置"
+    BEGIN
+        MENUITEM "用户管理",                        ID_USER_MANAGE
+        MENUITEM "角色管理",                        ID_ROLE_MANAGE
+        MENUITEM "参数设置",                        ID_PARAM_SET
+        MENUITEM "操作日志",                        ID_LOG
     END
 END
@@ -130,10 +146,11 @@ END
 IDR_ACCELERATOR_ORDER ACCELERATORS
 BEGIN
+    VK_DOWN,        ID_ACCELERATOR_DOWN,    VIRTKEY, NOINVERT
     VK_RETURN,      ID_ACCELERATOR_ENTER,   VIRTKEY, NOINVERT
     VK_TAB,         ID_ACCELERATOR_TAB,     VIRTKEY, NOINVERT
     VK_UP,          ID_ACCELERATOR_UP,      VIRTKEY, NOINVERT
-    VK_DOWN,        ID_ACCELERATOR_DOWN,    VIRTKEY, NOINVERT
+    VK_F11,         ID_ACCELERATOR_F11,     VIRTKEY, NOINVERT
 END
@@ -243,9 +260,10 @@ BEGIN
     LTEXT           "密   码：",IDC_PAY_STATIC_PASSWORD,18,50,31,8
     EDITTEXT        IDC_PAY_EDIT_PASSWORD,56,46,40,14,ES_MULTILINE | ES_AUTOHSCROLL
     PUSHBUTTON      "输入密码(&A)",IDC_PAY_BUTTON_PASSWORD,151,51,71,18
-    PUSHBUTTON      "关闭(&S)",IDC_PAY_BUTTON_CLOSE,155,95,67,17
-    PUSHBUTTON      "付款(&F)",IDC_PAY_BUTTON_PAY,72,95,67,17
+    PUSHBUTTON      "关闭(&S)",IDC_PAY_BUTTON_CLOSE,155,94,67,17
+    PUSHBUTTON      "付款(&F)",IDC_PAY_BUTTON_PAY,72,94,67,17
     LTEXT           "",IDC_PAY_STATIC_REAL_MONEY,65,20,57,8
+    LTEXT           "",IDC_STATIC_ERROR_MSG,68,71,8,8
 END
@@ -330,7 +348,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 222
         TOPMARGIN, 7
-        BOTTOMMARGIN, 112
+        BOTTOMMARGIN, 111
     END
 END
 #endif    // APSTUDIO_INVOKED
@@ -50,6 +50,7 @@ namespace HW
 	static const std::string JSON_VAL_FILEID_PIN_PAD = "11";
 	static const std::string JSON_VAL_FILEID_BANK_CARD_NUM = "20";
 	static const std::string JSON_VAL_FILEID_DILI_CARD_AND_BANK = "30";
+	static const std::string JSON_VAL_FILEID_ORDER = "40";
 	struct HWRequest
 	{
@@ -104,8 +105,7 @@ namespace HW
 			m_hw_cmd_map.insert(JSON_VAL_CMD_WRITE + JSON_VAL_FILEID_DILI_CARD_SERVICE_INFO, new WriteDILICardServiceInfoCmd());
 			m_hw_cmd_map.insert(JSON_VAL_CMD_READ + JSON_VAL_FILEID_BANK_CARD_NUM, new ReadBankCardNumCmd());
 			m_hw_cmd_map.insert(JSON_VAL_CMD_READ + JSON_VAL_FILEID_DILI_CARD_AND_BANK, new ReadDILIAndBankCardNumCmd());
-
-			m_hw_cmd_map.insert(std::string(JSON_VAL_CMD_PRINT), new StylusPrinterCmd());
+			m_hw_cmd_map.insert(JSON_VAL_CMD_PRINT + JSON_VAL_FILEID_ORDER, new StylusPrinterCmd());
 		}
 		std::string HandleRequest(const std::string& request_json)
 		{
@@ -1546,7 +1546,7 @@ bool StylusPrinterCmd::ParseInput(std::string &amp;input, std::vector&lt;OrderInfo&gt; &amp;or
 			BOOST_FOREACH(PT::ptree::value_type &v, products_ptree)
 			{
 				CommInfo comm_info;
-				comm_info.comm_id = v.second.get<std::string>(JSON_TAG_ORDER_ID).c_str();
+				comm_info.comm_id = v.second.get<long>(JSON_TAG_ORDER_ID);
 				comm_info.comm_name = v.second.get<std::string>(JSON_TAG_PRODUCT_NAME).c_str();
 				comm_info.price = v.second.get<std::string>(JSON_TAG_PRICE).c_str();
 				comm_info.count = v.second.get<std::string>(JSON_TAG_AMOUNT).c_str();
@@ -101,7 +101,7 @@ class StylusPrinterCmd : public HardwareCmd
 {
 	struct CommInfo
 	{
-		CString comm_id;
+		long comm_id;
 		CString comm_name;
 		CString price;
 		CString count;
@@ -192,15 +192,15 @@ BOOL CETradeClientApp::InitInstance()
 	SetRegistryKey(APP_ID);
 	//for test
-	PlaceOrderDlg dlg;
-	if (dlg.DoModal())
+	//PlaceOrderDlg dlg;
+	/*if (dlg.DoModal())
 	{
-		return FALSE;
-	}
+	return FALSE;
+	}*/
 	//
 	// First, do login job.
-	if (!CLoginDialog(L"欢迎使用中央结算系统！").Launch())
+	if (!CLoginDialog(L"欢迎使用综合业务系统！").Launch())
 	{
 		LOG_TRACE(L"登录系统未完成，程序关闭。");
 		return FALSE;
@@ -77,7 +77,8 @@ void CGridCellBase::Reset()
 	m_MergeCellID.row=-1;
 	m_MergeCellID.col=-1;
-
+	product_id.clear();
+	data_id = 0;
 }
 //Used for merge cells,remove const
 //by Huang Wei
@@ -74,7 +74,7 @@ typedef struct _GV_ITEM {
 // Each cell contains one of these. Fields "row" and "column" are not stored since we
 // will usually have acces to them in other ways, and they are an extra 8 bytes per
 // cell that is probably unnecessary.
-
+#include <string>
 class CGridCellBase : public CObject
 {
     friend class CGridCtrl;
@@ -85,6 +85,7 @@ public:
     CGridCellBase();
     virtual ~CGridCellBase();
+
 // Attributes
 public:
     virtual void SetText(LPCTSTR /* szText */)              = 0 ;
@@ -180,6 +181,12 @@ private:
 	bool m_IsMergeWithOthers;
 	CCellID m_MergeCellID;
 	bool m_Hide;
+
+public:
+	//为了业务，为了部落，为了该死的product_id
+	std::string product_id;
+	int data_id;
+	//
 };
 //{{AFX_INSERT_LOCATION}}
@@ -118,6 +118,8 @@
 #include <afxadv.h>            // For CSharedFile
 #include <afxconv.h>           // For LPTSTR -> LPSTR macros
+#include "Resource.h"
+
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #undef THIS_FILE
@@ -379,6 +381,12 @@ BOOL CGridCtrl::Initialise()
     return TRUE;
 }
+#include "../utility/win_msg_define.h"
+void CGridCtrl::DeleteComm()
+{
+	::SendMessage(GetParent()->GetSafeHwnd(), WM_ORDER_DELETE_ORDER, NULL, NULL);
+}
+
 // creates the control - use like any other window create control
 BOOL CGridCtrl::Create(const RECT& rect, CWnd* pParentWnd, UINT nID, DWORD dwStyle)
 {
@@ -553,6 +561,7 @@ BEGIN_MESSAGE_MAP(CGridCtrl, CWnd)
     ON_MESSAGE(WM_GETFONT, OnGetFont)
     ON_MESSAGE(WM_IME_CHAR, OnImeChar)
     ON_NOTIFY(GVN_ENDLABELEDIT, IDC_INPLACE_CONTROL, OnEndInPlaceEdit)
+	ON_COMMAND(ID_POPMENU_DELETE, &CGridCtrl::DeleteComm)
 END_MESSAGE_MAP()
@@ -4616,7 +4625,7 @@ BOOL CGridCtrl::GetItem(GV_ITEM* pItem)
     return TRUE;
 }
-BOOL CGridCtrl::SetItemText(int nRow, int nCol, LPCTSTR str)
+BOOL CGridCtrl::SetItemText(int nRow, int nCol, LPCTSTR str, int data_id, std::string product_id)
 {
     if (GetVirtualMode())
         return FALSE;
@@ -4626,6 +4635,10 @@ BOOL CGridCtrl::SetItemText(int nRow, int nCol, LPCTSTR str)
         return FALSE;
     pCell->SetText(str);
+	//ÎªÁË¸ÃËÀµÄÏÂµ¥ÒµÎñ
+	pCell->product_id = product_id;
+	pCell->data_id = data_id;
+	//
     SetModified(TRUE, nRow, nCol);
     return TRUE;
@@ -6550,6 +6563,17 @@ void CGridCtrl::OnRButtonUp(UINT nFlags, CPoint point)
             pCell->OnRClick( GetPointClicked( FocusCell.row, FocusCell.col, point) );
         SendMessageToParent(FocusCell.row, FocusCell.col, NM_RCLICK);
+
+		if (FocusCell.col > 1 && FocusCell.row > 0)
+		{
+			CPoint pt;
+			::GetCursorPos(&pt);
+			CMenu menu;
+			menu.LoadMenu(IDR_MENU1);
+			CMenu* mu = menu.GetSubMenu(0);
+			mu->TrackPopupMenu(TPM_RIGHTBUTTON, pt.x, pt.y, this, NULL);
+		}
+		
     }
 }
 #endif
@@ -33,6 +33,8 @@
 #include "GridCell.h"
 #include <afxtempl.h>
+#include <string>
+
 ///////////////////////////////////////////////////////////////////////////////////
 // Defines - these determine the features (and the final size) of the final code
@@ -364,7 +366,7 @@ public:
     BOOL   SetItem(const GV_ITEM* pItem);
     BOOL   GetItem(GV_ITEM* pItem);
-    BOOL   SetItemText(int nRow, int nCol, LPCTSTR str);
+    BOOL   SetItemText(int nRow, int nCol, LPCTSTR str, int data_id = 0, std::string product_id = "");
     // The following was virtual. If you want to override, use 
     //  CGridCellBase-derived class's GetText() to accomplish same thing
     CString GetItemText(int nRow, int nCol) const;
@@ -798,6 +800,8 @@ protected:
                        MOUSE_PREPARE_DRAG, MOUSE_DRAGGING
 #endif
     };
+
+	afx_msg void DeleteComm();
 };
 // Returns the default cell implementation for the given grid region
@@ -58,8 +58,9 @@ namespace
 	static std::vector<TBBUTTON> kQuickAccessBtn =
 	{
-		{ 0, ID_PAY_FEE, TBSTATE_ENABLED, BTNS_BUTTON, 0, 0 },
-		{ 1, ID_ORDER, TBSTATE_ENABLED, BTNS_BUTTON, 0, 0 }
+		{ 0, ID_ORDER, TBSTATE_ENABLED, BTNS_BUTTON, 0, 0 },
+		{ 1, ID_COMM_REGIST, TBSTATE_ENABLED, BTNS_BUTTON, 0, 0 },
+		{ 2, ID_COMM_DISTRIB, TBSTATE_ENABLED, BTNS_BUTTON, 0, 0 }
 	};
 } // namespace
@@ -80,7 +81,7 @@ BEGIN_MESSAGE_MAP(CMainFrame, CFrameWnd)
 	ON_COMMAND(ID_MODIFY_PASSWORD, OnModifyPwd)
 	ON_UPDATE_COMMAND_UI(USER_MESSAGE, &CMainFrame::OnUpdateToolBarMsgCount)
-	ON_COMMAND_RANGE(ID_PAY_FEE, ID_RIGHT_MANAGE, OnMenuBtnClicked)
+	ON_COMMAND_RANGE(ID_ORDER, ID_LOG, OnMenuBtnClicked)
 	ON_COMMAND_RANGE(RELOAD, USER_ACCOUNT, OnToolBarBtnClicked)
 	ON_MESSAGE(WM_CEF_SESSION_EXPIRED, OnSessionExpired)
@@ -315,8 +316,10 @@ void CMainFrame::OnMenuBtnClicked(UINT btn_id)
 		PlaceOrderDlg dlg;
 		dlg.DoModal();
 	}
-
-	m_view.Browser().NavigateTo(MenuUrl(btn_id));
+	else
+	{
+		m_view.Browser().NavigateTo(MenuUrl(btn_id));
+	}
 }
 void CMainFrame::OnToolbarDropDown(NMHDR* pNMHDR, LRESULT* pResult)
@@ -132,11 +132,11 @@ bool CEditBox::CheckCardNum(CString num)
 	do 
 	{
-		if (num.GetLength() > 12)
+		/*if (num.GetLength() > 12)
 		{
-			result = false;
-			break;
-		}
+		result = false;
+		break;
+		}*/
 		if (num.SpanIncluding(L"0123456789") != num)
 		{
@@ -7,15 +7,30 @@
 #include "afxdialogex.h"
 #include "etradeclient/hardware/hardware_cmd.h"
 #include "etradeclient/boost_patch/property_tree/json_parser.hpp"
+#include "ETradeClient/utility/win_msg_define.h"
+#include "ETradeClient/utility/logging.h"
+#include "etradeclient/utility/url_config.h"
+#include "etradeclient/utility/application_config.h"
+#include "etradeclient/browser/session.h"
+#include "ETradeClient/utility/string_converter.h"
+#include "ETradeClient/utility/win_msg_define.h"
+#include <vector>
+#include "pay_dlg.h"
+#include "etradeclient/hardware/hardware_cmd.h"
+#include "ETradeClient/utility/logging.h"
+#include <sstream>
+
 // PayDlg 对话框
 IMPLEMENT_DYNAMIC(PayDlg, CDialogEx)
-PayDlg::PayDlg(CWnd* pParent /*=NULL*/)
+PayDlg::PayDlg(long statement_id, CString total_money, int card_type, CWnd* pParent /*=NULL*/)
 	: CDialogEx(PayDlg::IDD, pParent)
 {
-
+	statement_id_ = statement_id;
+	total_money_ = total_money;
+	card_type_ = card_type;
 }
 PayDlg::~PayDlg()
@@ -32,12 +47,14 @@ void PayDlg::DoDataExchange(CDataExchange* pDX)
 	DDX_Control(pDX, IDC_PAY_BUTTON_PAY, pay_button_);
 	DDX_Control(pDX, IDC_PAY_BUTTON_CLOSE, close_button_);
 	DDX_Control(pDX, IDC_PAY_BUTTON_PASSWORD, password_button_);
+	DDX_Control(pDX, IDC_STATIC_ERROR_MSG, error_msg_static_);
 }
 BEGIN_MESSAGE_MAP(PayDlg, CDialogEx)
 	ON_BN_CLICKED(IDC_PAY_BUTTON_CLOSE, &PayDlg::OnBnClickedPayButtonClose)
 	ON_BN_CLICKED(IDC_PAY_BUTTON_PAY, &PayDlg::OnBnClickedPayButtonPay)
+	ON_WM_CTLCOLOR()
 END_MESSAGE_MAP()
@@ -50,6 +67,20 @@ BOOL PayDlg::OnInitDialog()
 	SetCtrlPos();
+	real_money_static_.SetWindowText(total_money_);
+	if (card_type_ == 30)
+	{
+		password_static_.ShowWindow(SW_HIDE);
+		password_edit_.ShowWindow(SW_HIDE);
+		password_button_.ShowWindow(SW_HIDE);
+	}
+	else
+	{
+		password_static_.ShowWindow(SW_SHOW);
+		password_edit_.ShowWindow(SW_SHOW);
+		password_button_.ShowWindow(SW_SHOW);
+	}
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	// 异常:  OCX 属性页应返回 FALSE
 }
@@ -88,7 +119,13 @@ void PayDlg::SetCtrlPos()
 	CRect dlg_rect;
 	GetClientRect(&dlg_rect);
-	ctrl_rect.bottom = dlg_rect.bottom;
+
+	ctrl_rect.left = 30;
+	ctrl_rect.right = dlg_rect.right - 30;
+	error_msg_static_.MoveWindow(&ctrl_rect);
+
+	
+	ctrl_rect.bottom = dlg_rect.bottom - 20;
 	ctrl_rect.top = ctrl_rect.bottom - ButtonHeight;
 	ctrl_rect.right = dlg_rect.right - 100;
 	ctrl_rect.left = ctrl_rect.right - ButtonWidth;
@@ -114,7 +151,102 @@ void PayDlg::OnBnClickedPayButtonClose()
 void PayDlg::OnBnClickedPayButtonPay()
 {
+	std::string statement_data;
+	do
+	{
+		CString error_msg;
+		const uint32_t kHTTPOK = 200;
+		WinHttp win_http;
+		auto& url_cfg = URLConfig::Instance();
+		win_http.ConnectHost(url_cfg.Host(), url_cfg.Port(), url_cfg.IsHttps());
+		std::string url = url_cfg.GetSubmitOrdersPath();
+		auto& request = win_http.OpenRequest(WinHttp::Method::POST, url);
+
+		CString pass_word;
+		password_edit_.GetWindowText(pass_word);
+
+		std::ostringstream os;
+		os << statement_id_;
+		std::string statement_id_str;
+		std::istringstream is(os.str());
+		is >> statement_id_str;
+
+		std::string post_data = "{\"statementId\":" + statement_id_str + "\"password\":\"" + wstr_2_str(pass_word) + "\"}";
+
+		request.SetPostData(post_data);
+		if (url_cfg.IsHttps())
+		{
+			auto& app_cfg = ApplicationConfig::Instance();
+			request.SetClientCertificate(app_cfg.ClientCertStore(), app_cfg.ClientCertSubject());
+		}
+		request.SetCookies(Session::Instance().Cookies());
+		request.Send();
+		uint32_t status_code = request.GetResponseStatus();
+		if (kHTTPOK != status_code)
+		{
+			std::string err_msg = "网络请求错误！ 错误码: " + std::to_string(status_code);
+			LOG_ERROR(str_2_wstr(err_msg.c_str()));
+			error_msg = err_msg.c_str();
+			break;
+		}
+		std::string response_body = request.ReadResponseBody();
+		if (response_body.empty())
+		{
+			LOG_ERROR(L"获取服务器响应数据失败，请确保网络连接正常！");
+			error_msg = CString(L"获取服务器响应数据失败，请确保网络连接正常！");
+			break;
+		}
+
+		namespace PT = boost::property_tree;
+		bool card_res = false;
+		try //Parse the configuration file
+		{
+			PT::ptree ptree;
+			std::stringstream ss;
+			ss << response_body;
+			PT::read_json(ss, ptree);
+			if (ptree.get<int>("code") == 0)
+			{
+				statement_data = ptree.get<std::string>("data");
+			}
+			else
+			{
+				error_msg = ptree.get<std::string>("message").c_str();
+				break;
+			}
+
+		}
+		catch (...)
+		{
+			LOG_ERROR(L"解析服务器返回的登录结果信息时出错！请确认返回数据不为空，返回的数据格式为正确的Json格式！");
+			error_msg = CString(L"解析服务器返回的登录结果信息时出错！请确认返回数据不为空，返回的数据格式为正确的Json格式！");
+			break;
+		}
+	} while (0);
+
 	auto printer_device = StylusPrinterCmd();
-	
-	HardwareCmd::Reply reply = printer_device.Execute("{\"title\":\"长春结地利算单\",\"orders\":[{\"statementId\":\"123456\",\"tradeTime\":\"2018/10/10\",\"buyerName\":\"大熊\",\"sellerName\":\"卖家大熊\",\"userName\":\"结算员大熊\",\"totalMoney\":\"11001.91\",\"products\":[{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"55.5\",\"amount\":\"500\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"}]},{\"statementId\":\"123456\",\"tradeTime\":\"2018/10/10\",\"buyerName\":\"大熊\",\"sellerName\":\"卖家大熊\",\"userName\":\"结算员大熊\",\"totalMoney\":\"11001.91\",\"products\":[{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"55.5\",\"amount\":\"500\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"},{\"orderId\":1000,\"productName\":\"商品名称大熊\",\"price\":\"2753\",\"amount\":\"752\",\"money\":\"1021.01\"}]}]}");
+	HardwareCmd::Reply reply = printer_device.Execute(statement_data);
+
+	CDialogEx::OnCancel();
+}
+
+void PayDlg::SetErrorMsg(CString error)
+{
+	error_msg_static_.SetWindowTextW(error);
+}
+
+
+HBRUSH PayDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
+{
+	HBRUSH hbr = CDialogEx::OnCtlColor(pDC, pWnd, nCtlColor);
+
+	if (nCtlColor == CTLCOLOR_STATIC)
+	{
+		if (IDC_STATIC_ERROR_MSG == pWnd->GetDlgCtrlID())
+		{
+			pDC->SetTextColor(RGB(200, 0, 0));
+		}
+	}
+
+	return hbr;
 }
@@ -9,7 +9,7 @@ class PayDlg : public CDialogEx
 	DECLARE_DYNAMIC(PayDlg)
 public:
-	PayDlg(CWnd* pParent = NULL);   // 标准构造函数
+	PayDlg(long statement_id, CString total_money, int card_type, CWnd* pParent = NULL);   // 标准构造函数
 	virtual ~PayDlg();
 // 对话框数据
@@ -21,15 +21,25 @@ protected:
 	DECLARE_MESSAGE_MAP()
 public:
 	virtual BOOL OnInitDialog();
+	afx_msg void OnBnClickedPayButtonClose();
+	afx_msg void OnBnClickedPayButtonPay();
+	afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
+
+private:
+	void SetCtrlPos();
+	void SetErrorMsg(CString error);
+
+private:
 	CStatic total_money_static_;
 	CStatic real_money_static_;
 	CStatic password_static_;
 	CEdit password_edit_;
 	CButton pay_button_;
 	CButton close_button_;
-
-	void SetCtrlPos();
-	afx_msg void OnBnClickedPayButtonClose();
 	CButton password_button_;
-	afx_msg void OnBnClickedPayButtonPay();
+	CStatic error_msg_static_;
+
+	long statement_id_;
+	CString total_money_;
+	int card_type_;
 };
@@ -23,10 +23,11 @@
 IMPLEMENT_DYNAMIC(PlaceOrderDlg, CDialogEx)
 PlaceOrderDlg::PlaceOrderDlg(CWnd* pParent /*=NULL*/)
-	: CDialogEx(PlaceOrderDlg::IDD, pParent)
+: CDialogEx(PlaceOrderDlg::IDD, pParent)
 {
 	line_pen_.CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
 	edit_brush_.CreateSolidBrush(RGB(245, 247, 250));
+	comm_id_index_ = 1;
 }
 PlaceOrderDlg::~PlaceOrderDlg()
@@ -74,8 +75,10 @@ BEGIN_MESSAGE_MAP(PlaceOrderDlg, CDialogEx)
 	ON_MESSAGE(WM_ORDER_KILL_FOCUS, &PlaceOrderDlg::OnEditKillFocus)
 	ON_COMMAND(ID_ACCELERATOR_DOWN, &PlaceOrderDlg::OnAcceleratorDown)
 	ON_COMMAND(ID_ACCELERATOR_UP, &PlaceOrderDlg::OnAcceleratorUp)
+	ON_COMMAND(ID_ACCELERATOR_F11, &PlaceOrderDlg::OnBnClickedButtonSwipCard)
 	ON_WM_SETFOCUS()
 	ON_BN_CLICKED(IDC_BUTTON_SWIP_CARD, &PlaceOrderDlg::OnBnClickedButtonSwipCard)
+	ON_MESSAGE(WM_ORDER_DELETE_ORDER, &PlaceOrderDlg::DeleteComm)
 END_MESSAGE_MAP()
@@ -239,7 +242,7 @@ void PlaceOrderDlg::SetCtrlPos()
 	CRect dlg_rect;
 	GetClientRect(&dlg_rect);
-	ctrl_rect.top += 10;
+	//ctrl_rect.top += 10;
 	ctrl_rect.left = ctrl_rect.right + 30;
 	ctrl_rect.right = dlg_rect.right;
 	error_static_.MoveWindow(&ctrl_rect);
@@ -259,9 +262,10 @@ void PlaceOrderDlg::SetCtrlPos()
 	total_money_static_.MoveWindow(&ctrl_rect);
 	ctrl_rect.left = ctrl_rect.right;
-	ctrl_rect.right = dlg_rect.right;
+	ctrl_rect.right = dlg_rect.right - 10 - ButtonWidth - 5;
 	total_real_money_static_.MoveWindow(&ctrl_rect);
+	ctrl_rect.top -= 5;
 	ctrl_rect.right = dlg_rect.right - 10;
 	ctrl_rect.left = ctrl_rect.right - ButtonWidth;
 	pay_button_.MoveWindow(&ctrl_rect);
@@ -352,12 +356,154 @@ HBRUSH PlaceOrderDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
 void PlaceOrderDlg::OnBnClickedButtonPay()
 {
-	PayDlg pay_dlg;
-	pay_dlg.DoModal();
+	int row_count = product_list_.GetRowCount();
+	if (row_count == 0)
+	{
+		SetErrorMsg(CString(L"订单信息为空！"));
+		return;
+	}
+
+	struct Comm
+	{
+		std::string product_id;
+		std::string price;
+		std::string amount;
+		std::string unit;
+		std::string weight;
+	};
+	struct Order
+	{
+		std::string seller_card;
+		std::vector<Comm> comm_vec;
+	};
+	std::vector<Order> orders_list;
+	Order current_order;
+	for (int row = 0; row < row_count; ++row)
+	{
+		std::string card = wstr_2_str(product_list_.GetItemText(row, 0));
+		if (card.compare(current_order.seller_card) != 0)
+		{
+			orders_list.push_back(current_order);
+			current_order.comm_vec.clear();
+			current_order.seller_card = card;
+		}
+
+		Comm comm_info;
+		CGridCellBase* product_cell = product_list_.GetCell(row, 2);
+		comm_info.product_id == product_cell->product_id;
+		comm_info.price = wstr_2_str(product_list_.GetItemText(row, 3));
+		comm_info.amount = wstr_2_str(product_list_.GetItemText(row, 4));
+		comm_info.unit = product_list_.GetItemText(row, 5).Compare(L"斤") == 0 ? "1" : "2";
+		comm_info.weight = wstr_2_str(product_list_.GetItemText(row, 6));
+
+		current_order.comm_vec.push_back(comm_info);
+	}
+
+	CString buyer_card;
+	buyer_card_edit_.GetWindowText(buyer_card);
+
+	CString error_msg;
+	long statement_id = 0;
+	std::string total_money;
+	do
+	{
+		const uint32_t kHTTPOK = 200;
+		WinHttp win_http;
+		auto& url_cfg = URLConfig::Instance();
+		win_http.ConnectHost(url_cfg.Host(), url_cfg.Port(), url_cfg.IsHttps());
+		std::string url = url_cfg.GetSubmitOrdersPath();
+		auto& request = win_http.OpenRequest(WinHttp::Method::POST, url);
+
+		std::string post_data = "{\"paymentType\":1,\"cardNo\":\"" + wstr_2_str(buyer_card) + "\",\"orders\":[";
+		for (auto iter_order : orders_list)
+		{
+			post_data += "{\"cardNo\":\"" + iter_order.seller_card + "\",\"products\":[";
+			for (auto iter_product : iter_order.comm_vec)
+			{
+				post_data += "{\"productId\":" + iter_product.product_id + ",\"price\":\"" + iter_product.price + "\",\"amount\":\"" + iter_product.amount + \
+					"\",\"unit\":" + iter_product.unit + ",\"weight\":\"" + iter_product.weight + "\"},";
+			}
+			post_data.erase(post_data.end() - 1);
+			post_data += "]},";
+		}
+		post_data.erase(post_data.end() - 1);
+		post_data += "]}";
+
+
+		request.SetPostData(post_data);
+		if (url_cfg.IsHttps())
+		{
+			auto& app_cfg = ApplicationConfig::Instance();
+			request.SetClientCertificate(app_cfg.ClientCertStore(), app_cfg.ClientCertSubject());
+		}
+		request.SetCookies(Session::Instance().Cookies());
+		request.Send();
+		uint32_t status_code = request.GetResponseStatus();
+		if (kHTTPOK != status_code)
+		{
+			std::string err_msg = "网络请求错误！ 错误码: " + std::to_string(status_code);
+			LOG_ERROR(str_2_wstr(err_msg.c_str()));
+			error_msg = err_msg.c_str();
+			break;
+		}
+		std::string response_body = request.ReadResponseBody();
+		if (response_body.empty())
+		{
+			LOG_ERROR(L"获取服务器响应数据失败，请确保网络连接正常！");
+			error_msg = CString(L"获取服务器响应数据失败，请确保网络连接正常！");
+			break;
+		}
+
+		namespace PT = boost::property_tree;
+		bool card_res = false;
+		try //Parse the configuration file
+		{
+			PT::ptree ptree;
+			std::stringstream ss;
+			ss << response_body;
+			PT::read_json(ss, ptree);
+			if (ptree.get<int>("code") == 0)
+			{
+				PT::ptree statement_data = ptree.get_child("data");
+				statement_id = statement_data.get<long>("statementId");
+				total_money = statement_data.get<std::string>("totalMoney");
+			}
+			else
+			{
+				error_msg = ptree.get<std::string>("message").c_str();
+				break;
+			}
+
+		}
+		catch (...)
+		{
+			LOG_ERROR(L"解析服务器返回的登录结果信息时出错！请确认返回数据不为空，返回的数据格式为正确的Json格式！");
+			error_msg = CString(L"解析服务器返回的登录结果信息时出错！请确认返回数据不为空，返回的数据格式为正确的Json格式！");
+			break;
+		}
+	} while (0);
+
+	if (!error_msg.IsEmpty())
+	{
+		SetErrorMsg(error_msg);
+	}
+	else
+	{
+		EmptyCtrl();
+		SetCtrlInitData();
+		InitList();
+		comm_id_index_;
+		comm_vec_.clear();
+
+		PayDlg pay_dlg(statement_id, CString(total_money.c_str()), buyer_card_type_);
+		pay_dlg.DoModal();
+	}
 }
 void PlaceOrderDlg::InitList()
 {
+	product_list_.DeleteAllItems();
+
 	product_list_.InsertColumn(L"货主卡号");
 	product_list_.InsertColumn(L"货主姓名");
 	product_list_.InsertColumn(L"商品名称");
@@ -388,6 +534,7 @@ void PlaceOrderDlg::InitList()
 	product_list_.SetListMode(TRUE);
 	product_list_.SetSingleColSelection(TRUE);
 	product_list_.SetSingleRowSelection(FALSE);
+	product_list_.SetFixedRowSelection(true);
 	product_list_.SetRowResize(FALSE);
 	product_list_.SetColumnResize(FALSE);
@@ -411,6 +558,13 @@ void PlaceOrderDlg::OnAcceleratorTab()
 {
 }
+
+int PlaceOrderDlg::GetCommIndex()
+{
+	++comm_id_index_;
+	return comm_id_index_;
+}
+
 void PlaceOrderDlg::OnAcceleratorEnter()
 {
 	OnEditKillFocus(IDC_EDIT_CARD, NULL);
@@ -420,6 +574,8 @@ void PlaceOrderDlg::OnAcceleratorEnter()
 	OnEditKillFocus(IDC_EDIT_PRICE, NULL);
 	OnEditKillFocus(IDC_EDIT_COUNT, NULL);
+	card_edit_.SetFocus();
+
 	do 
 	{
 		if (card_edit_.IsEditRed() || comm_num_edit_.IsEditRed() ||
@@ -434,30 +590,49 @@ void PlaceOrderDlg::OnAcceleratorEnter()
 		CString text;
 		double price = 0, count = 0;
 		card_edit_.GetWindowText(text);
-		product_list_.SetItemText(row_index, 0, text);
+		CommInfo comm;
+		comm.comm_id = GetCommIndex();
+		comm.seller_card = text;
+		product_list_.SetItemText(row_index, 0, text, comm.comm_id);
 		text.Empty();
+
 		name_edit_.GetWindowText(text);
-		product_list_.SetItemText(row_index, 1, text);
+		comm.seller_name = text;
+		product_list_.SetItemText(row_index, 1, text, comm.comm_id);
 		text.Empty();
+
 		comm_name_edit_.GetWindowText(text);
-		product_list_.SetItemText(row_index, 2, text);
+		comm.comm_name = text;
+		product_list_.SetItemText(row_index, 2, text, comm.comm_id, wstr_2_str(product_id_));
 		text.Empty();
+
 		price_edit_.GetWindowText(text);
 		price = _ttof(text);
-		product_list_.SetItemText(row_index, 3, text);
+		comm.price = text;
+		product_list_.SetItemText(row_index, 3, text, comm.comm_id);
 		text.Empty();
+
 		count_edit_.GetWindowText(text);
 		count = _ttof(text);
-		product_list_.SetItemText(row_index, 4, text);
+		comm.count = text;
+		product_list_.SetItemText(row_index, 4, text, comm.comm_id);
 		text.Empty();
+
 		real_unit_static.GetWindowText(text);
-		product_list_.SetItemText(row_index, 5, text);
+		comm.unit = text;
+		product_list_.SetItemText(row_index, 5, text, comm.comm_id);
 		text.Empty();
+
 		heavy_edit_.GetWindowText(text);
-		product_list_.SetItemText(row_index, 6, text);
+		comm.weight = text;
+		product_list_.SetItemText(row_index, 6, text, comm.comm_id);
 		text.Empty();
+
 		text.Format(_T("%.1f"), price * count);
-		product_list_.SetItemText(row_index, 7, text);
+		comm.total_money = text;
+		product_list_.SetItemText(row_index, 7, text, comm.comm_id);
+
+		comm_vec_.push_back(comm);
 		for (int index = 0; index < 8; ++index)
 		{
@@ -470,7 +645,7 @@ void PlaceOrderDlg::OnAcceleratorEnter()
 		CString subtotal;
 		double total_price = 0;
 		int list_count = product_list_.GetRowCount();
-		for (int index = 1; index <= count; ++index)
+		for (int index = 1; index <= list_count; ++index)
 		{
 			subtotal = product_list_.GetItemText(index, 7);
 			total_price += _ttof(subtotal);
@@ -482,6 +657,15 @@ void PlaceOrderDlg::OnAcceleratorEnter()
 	} while (0);
+	if (product_list_.GetRowCount() > 1)
+	{
+		pay_button_.EnableWindow(TRUE);
+	}
+	else
+	{
+		pay_button_.EnableWindow(FALSE);
+	}
+
 	UpdateWindow();
 }
@@ -491,7 +675,7 @@ void PlaceOrderDlg::SetCtrlInitData()
 	EnableCtrl(false);
 	card_edit_.SetWindowTextW(L"8888");
-	
+
 	card_edit_.SetCheck(CardNumType);
 	comm_num_edit_.SetCheck(CommNumType);
 	unit_edit_.SetCheck(UnitType);
@@ -502,6 +686,7 @@ void PlaceOrderDlg::SetCtrlInitData()
 	card_edit_.SetFocus();
 	card_edit_.SetSel(4, 4);
 	heavy_edit_.EnableWindow(FALSE);
+	pay_button_.EnableWindow(FALSE);
 }
 void PlaceOrderDlg::SetErrorMsg(CString &error)
@@ -521,13 +706,13 @@ LRESULT PlaceOrderDlg::OnEditKillFocus(WPARAM wParam, LPARAM lParam)
 	case IDC_EDIT_CARD:
 	{
 		CString name;
-		if (text.GetLength() < 12)
+		/*if (text.GetLength() < 12)
 		{
-			card_edit_.SetEditRed(true);
-			break;
-		}
+		card_edit_.SetEditRed(true);
+		break;
+		}*/
-		bool result = GetCardName(text, name);
+		bool result = GetCardName(text, name, 2);
 		if (result)
 		{
 			name_edit_.SetWindowText(name);
@@ -549,8 +734,9 @@ LRESULT PlaceOrderDlg::OnEditKillFocus(WPARAM wParam, LPARAM lParam)
 			comm_num_edit_.SetEditRed(true);
 			break;
 		}
-
-		bool result = GetCardName(text, name);
+		CString buyer_card;
+		buyer_card_edit_.GetWindowText(buyer_card);
+		bool result = GetCommName(text, buyer_card, name, product_id_);
 		if (result)
 		{
 			name_edit_.SetWindowText(name);
@@ -619,49 +805,156 @@ LRESULT PlaceOrderDlg::OnEditKillFocus(WPARAM wParam, LPARAM lParam)
 }
-bool PlaceOrderDlg::GetCardName(CString &num, CString &name)
+bool PlaceOrderDlg::GetCardName(CString &num, CString &name, int type)
 {
-	//for test
-	return true;
-	//
-
-
 	bool result = true;
-	CString sLog;
+	LOG_TRACE(_T("获取卡片姓名！"));
+	do 
+	{
+		const uint32_t kHTTPOK = 200;
+		WinHttp win_http;
+		auto& url_cfg = URLConfig::Instance();
+		win_http.ConnectHost(url_cfg.Host(), url_cfg.Port(), url_cfg.IsHttps());
+		std::string path = type == 1 ? url_cfg.GetCardNamePath() : url_cfg.GetSellerCardPath();
+		std::string url = path + "?cardNo=" + wstr_2_str(num);
+		auto& request = win_http.OpenRequest(WinHttp::Method::POST, url);
+		if (url_cfg.IsHttps())
+		{
+			auto& app_cfg = ApplicationConfig::Instance();
+			request.SetClientCertificate(app_cfg.ClientCertStore(), app_cfg.ClientCertSubject());
+		}
+		request.SetCookies(Session::Instance().Cookies());
+		request.Send();
+		uint32_t status_code = request.GetResponseStatus();
+		if (kHTTPOK != status_code)
+		{
+			std::string err_msg = "网络请求错误！ 错误码: " + std::to_string(status_code);
+			LOG_ERROR(str_2_wstr(err_msg.c_str()));
+			name = CString(L"网络请求错误！");
+			result = false;
+			break;
+		}
+		std::string response_body = request.ReadResponseBody();
+		if (response_body.empty())
+		{
+			LOG_ERROR(L"获取服务器响应数据失败，请确保网络连接正常！");
+			name = CString(L"获取服务器响应数据失败，请确保网络连接正常！");
+			result = false;
+			break;
+		}
-	LOG_TRACE(_T("获取开卡人姓名！"));
+		namespace PT = boost::property_tree;
+		bool card_res = false;
+		try //Parse the configuration file
+		{
+			PT::ptree ptree;
+			std::stringstream ss;
+			ss << response_body;
+			PT::read_json(ss, ptree);
+			std::string res = ptree.get<std::string>("code");
+			card_res = res.compare(0) == 0 ? true : false;
+			if (!card_res)
+			{
+				PT::ptree card_data = ptree.get_child("data");
+				name = card_data.get<std::string>("name").c_str();
+				buyer_card_type_ = card_data.get<int>("category");
+			}
+			else
+			{
+				std::string error_msg = ptree.get<std::string>("message");
+				name = CString(error_msg.c_str());
+				result = false;
+				break;
+			}
-	const uint32_t kHTTPOK = 200;
-	WinHttp win_http;
-	auto& url_cfg = URLConfig::Instance();
-	win_http.ConnectHost(url_cfg.Host(), url_cfg.Port(), url_cfg.IsHttps());
-	auto& request = win_http.OpenRequest(WinHttp::Method::GET, url_cfg.GetCardNamePath());
-	if (url_cfg.IsHttps())
-	{
-		auto& app_cfg = ApplicationConfig::Instance();
-		request.SetClientCertificate(app_cfg.ClientCertStore(), app_cfg.ClientCertSubject());
-	}
-	request.SetCookies(Session::Instance().Cookies());
-	request.Send();
-	uint32_t status_code = request.GetResponseStatus();
-	if (kHTTPOK != status_code)
-	{
-		std::string err_msg = "网络请求错误！ 错误码: " + std::to_string(status_code);
-		LOG_ERROR(str_2_wstr(err_msg.c_str()));
-	}
-	std::string response_body = request.ReadResponseBody();
-	if (response_body.empty())
-	{
-		LOG_ERROR(L"获取服务器响应数据失败，请确保网络连接正常！");
-	}
+		}
+		catch (...)
+		{
+			LOG_ERROR(L"解析服务器返回的登录结果信息时出错！请确认返回数据不为空，返回的数据格式为正确的Json格式！");
+			name = CString(L"解析服务器返回的登录结果信息时出错！请确认返回数据不为空，返回的数据格式为正确的Json格式！");
+			result = false;
+			break;
+		}
+	} while (0);
 	return result;
 }
-bool PlaceOrderDlg::GetCommName(CString &num, CString &name)
+bool PlaceOrderDlg::GetCommName(CString &num, CString& card, CString &name, CString &product_id)
 {
-	return true;
+	bool result = true;
+
+	LOG_TRACE(_T("获取商品名称！"));
+	do
+	{
+		const uint32_t kHTTPOK = 200;
+		WinHttp win_http;
+		auto& url_cfg = URLConfig::Instance();
+		win_http.ConnectHost(url_cfg.Host(), url_cfg.Port(), url_cfg.IsHttps());
+		std::string url = url_cfg.GetCommNamePath() + "?cardNo=" + wstr_2_str(card) + "&shortCode=" + wstr_2_str(num);
+		auto& request = win_http.OpenRequest(WinHttp::Method::POST, url);
+		if (url_cfg.IsHttps())
+		{
+			auto& app_cfg = ApplicationConfig::Instance();
+			request.SetClientCertificate(app_cfg.ClientCertStore(), app_cfg.ClientCertSubject());
+		}
+		request.SetCookies(Session::Instance().Cookies());
+		request.Send();
+		uint32_t status_code = request.GetResponseStatus();
+		if (kHTTPOK != status_code)
+		{
+			std::string err_msg = "网络请求错误！ 错误码: " + std::to_string(status_code);
+			LOG_ERROR(str_2_wstr(err_msg.c_str()));
+			name = CString(L"网络请求错误！");
+			result = false;
+			break;
+		}
+		std::string response_body = request.ReadResponseBody();
+		if (response_body.empty())
+		{
+			LOG_ERROR(L"获取服务器响应数据失败，请确保网络连接正常！");
+			name = CString(L"获取服务器响应数据失败，请确保网络连接正常！");
+			result = false;
+			break;
+		}
+
+		namespace PT = boost::property_tree;
+		bool card_res = false;
+		try //Parse the configuration file
+		{
+			PT::ptree ptree;
+			std::stringstream ss;
+			ss << response_body;
+			PT::read_json(ss, ptree);
+			std::string res = ptree.get<std::string>("code");
+			card_res = res.compare(0) == 0 ? true : false;
+			if (!card_res)
+			{
+				PT::ptree card_data = ptree.get_child("data");
+				name = ptree.get<std::string>("productName").c_str();
+				long id = ptree.get<long>("id");
+				product_id.Format(L"%ld", id);
+			}
+			else
+			{
+				std::string error_msg = ptree.get<std::string>("message");
+				name = CString(error_msg.c_str());
+				result = false;
+				break;
+			}
+
+		}
+		catch (...)
+		{
+			LOG_ERROR(L"解析服务器返回的登录结果信息时出错！请确认返回数据不为空，返回的数据格式为正确的Json格式！");
+			name = CString(L"解析服务器返回的登录结果信息时出错！请确认返回数据不为空，返回的数据格式为正确的Json格式！");
+			result = false;
+			break;
+		}
+	} while (0);
+
+	return result;
 }
 void PlaceOrderDlg::OnAcceleratorDown()
@@ -822,12 +1115,19 @@ void PlaceOrderDlg::EmptyCtrl()
 	price_edit_.SetWindowText(L"");
 	count_edit_.SetWindowText(L"");
-	card_edit_.SetFocus();
+	buyer_card_edit_.SetWindowTextW(L"");
+	buyer_name_edit_.SetWindowTextW(L"");
+	total_real_money_static_.SetWindowTextW(L"0.00");
+
 	card_edit_.SetSel(4, 4);
 }
 void PlaceOrderDlg::OnBnClickedButtonSwipCard()
 {
+	EmptyCtrl();
+	InitList();
+	pay_button_.EnableWindow(FALSE);
+
 	auto dili_card_device = ReadDILIAndBankCardNumCmd();
 	HardwareCmd::Reply reply = dili_card_device.Execute("");
@@ -836,7 +1136,31 @@ void PlaceOrderDlg::OnBnClickedButtonSwipCard()
 	{
 		if (reply.error_code.compare("") != 0)
 		{
-			err_msg = "卡片异常！";
+			if (reply.error_code.compare("300") == 0)
+			{
+				err_msg = "打开CPU卡读卡器失败";
+			}
+			else if (reply.error_code.compare("301") == 0)
+			{
+				err_msg = "无法找到卡片，请放卡到读卡器上(或重新放置卡片)";
+			}
+			else if (reply.error_code.compare("304") == 0)
+			{
+				err_msg = "读取卡片基本信息失败";
+			}
+			else if (reply.error_code.compare("501") == 0)
+			{
+				err_msg = "读取银行卡卡号失败";
+			}
+			else
+			{
+				err_msg = "读卡失败";
+			}
+			std::wstring log = L"下单时读取买家卡失败，错误码:" + str_2_wstr(reply.error_code);
+			LOG_ERROR(log);
+			
+			buyer_card_edit_.SetWindowText(L"");
+			buyer_name_edit_.SetWindowText(L"");
 			break;
 		}
@@ -846,13 +1170,15 @@ void PlaceOrderDlg::OnBnClickedButtonSwipCard()
 		boost::property_tree::ptree card_type_node = reply.data.get_child("type");
 		std::string card_type = card_type_node.data();
-		if (!GetCardInfo(str_2_wstr(card_num).c_str(), err_msg))
+		CString card_name;
+		if (!GetCardName(CString(card_num.c_str()), card_name, 1))
 		{
+			err_msg = card_name;
 			break;
 		}
-		buyer_card_edit_.SetWindowText(card_info_.card_num);
-		buyer_name_edit_.SetWindowText(card_info_.card_name);
+		buyer_card_edit_.SetWindowText(CString(card_num.c_str()));
+		buyer_name_edit_.SetWindowText(card_name);
 		EnableCtrl(true);
@@ -862,6 +1188,11 @@ void PlaceOrderDlg::OnBnClickedButtonSwipCard()
 	{
 		SetErrorMsg(err_msg);
 	}
+	else
+	{
+		SetErrorMsg(CString(L""));
+	}
+
 }
@@ -886,8 +1217,64 @@ void PlaceOrderDlg::EnableCtrl(bool is_enable)
 	}
 }
-bool PlaceOrderDlg::GetCardInfo(CString num, CString &err_msg)
+afx_msg LRESULT PlaceOrderDlg::DeleteComm(WPARAM wParam, LPARAM lParam)
 {
-	return true;
-}
+	CCellID select_cell = product_list_.GetFocusCell();
+	int delete_comm_id = product_list_.GetCell(select_cell)->data_id;
+	for (std::vector<CommInfo>::iterator iter = comm_vec_.begin(); iter != comm_vec_.end(); ++iter)
+	{
+		if (iter->comm_id == delete_comm_id)
+		{
+			comm_vec_.erase(iter);
+			break;
+		}
+	}
+
+	product_list_.DeleteAllItems();
+	InitList();
+
+	for (int index = 0; index != comm_vec_.size(); ++index)
+	{
+		int row_index = product_list_.InsertRow(L"", -1);
+		product_list_.SetItemText(row_index, 0, comm_vec_[index].seller_card, comm_vec_[index].comm_id);
+		product_list_.SetItemText(row_index, 1, comm_vec_[index].seller_name, comm_vec_[index].comm_id);
+		product_list_.SetItemText(row_index, 2, comm_vec_[index].comm_name, comm_vec_[index].comm_id);
+		product_list_.SetItemText(row_index, 3, comm_vec_[index].price, comm_vec_[index].comm_id);
+		product_list_.SetItemText(row_index, 4, comm_vec_[index].count, comm_vec_[index].comm_id);
+		product_list_.SetItemText(row_index, 5, comm_vec_[index].unit, comm_vec_[index].comm_id);
+		product_list_.SetItemText(row_index, 6, comm_vec_[index].weight, comm_vec_[index].comm_id);
+		product_list_.SetItemText(row_index, 7, comm_vec_[index].total_money, comm_vec_[index].comm_id);
+		for (int index = 0; index < 8; ++index)
+		{
+			product_list_.SetItemFormat(row_index, index, DT_CENTER | DT_VCENTER | DT_SINGLELINE);
+		}
+	}
+
+	SortList();
+
+	CString subtotal;
+	double total_price = 0;
+	int list_count = product_list_.GetRowCount();
+	for (int index = 1; index <= list_count; ++index)
+	{
+		subtotal = product_list_.GetItemText(index, 7);
+		total_price += _ttof(subtotal);
+	}
+
+	CString total_price_s;
+	total_price_s.Format(L"%.2f", total_price);
+	total_real_money_static_.SetWindowText(total_price_s);
+
+	if (product_list_.GetRowCount() > 1)
+	{
+		pay_button_.EnableWindow(TRUE);
+	}
+	else
+	{
+		pay_button_.EnableWindow(FALSE);
+	}
+
+	product_list_.Invalidate(TRUE);
+	return 0;
+}
@@ -7,7 +7,9 @@
 #include "../utility/win_http.h"
 #include "etrade_edit_control.h"
 #include <string>
-
+#include "CellRange.h"
+#include "GridCell.h"
+#include <vector>
 // PlaceOrderDlg 对话框
@@ -15,6 +17,26 @@ class PlaceOrderDlg : public CDialogEx
 {
 	DECLARE_DYNAMIC(PlaceOrderDlg)
+	struct CardInfo
+	{
+		CString card_num;
+		CString card_name;
+		CString card_type;
+	};
+
+	struct CommInfo
+	{
+		int comm_id;
+		CString seller_card;
+		CString seller_name;
+		CString comm_name;
+		CString price;
+		CString count;
+		CString unit;
+		CString weight;
+		CString total_money;
+	};
+
 public:
 	PlaceOrderDlg(CWnd* pParent = NULL);   // 标准构造函数
 	virtual ~PlaceOrderDlg();
@@ -26,6 +48,16 @@ public:
 	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
 	afx_msg void OnPaint();
 	afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
+	afx_msg void OnBnClickedButtonPay();
+	virtual BOOL PreTranslateMessage(MSG* pMsg);
+	afx_msg void OnAcceleratorTab();
+	afx_msg void OnAcceleratorEnter();
+	afx_msg LRESULT OnEditKillFocus(WPARAM wParam, LPARAM lParam);
+	afx_msg void OnAcceleratorDown();
+	afx_msg void OnAcceleratorUp();
+	afx_msg void OnSetFocus(CWnd* pOldWnd);
+	afx_msg void OnBnClickedButtonSwipCard();
+	afx_msg LRESULT DeleteComm(WPARAM wParam, LPARAM lParam);
 // 对话框数据
 	enum { IDD = IDD_DIALOG_PLACE_ORDER };
@@ -35,12 +67,23 @@ protected:
 	DECLARE_MESSAGE_MAP()
-
 private:
 	void SetCtrlPos();
 	void SetCtrlInitData();
 	void InitList();
-public:
+	void SortList();
+	void EmptyCtrl();
+	void EnableCtrl(bool is_enable);
+
+	int GetCommIndex();
+
+	bool GetUserName(CString &name);
+	void SetErrorMsg(CString &error);
+	bool GetCardName(CString &num, CString &name, int type); //type =1是买家，2是买家
+	bool GetCommName(CString &num, CString& card, CString &name, CString &product_id);
+
+
+private:
 	CStatic owner_static_;
 	CEditBox card_edit_;
 	CEdit name_edit_;
@@ -58,59 +101,23 @@ public:
 	CEditBox count_edit_;
 	CButton pay_button_;
 	CGridCtrl product_list_;
-
-	CPen line_pen_;
-	CPoint line_point_[3];
-	
-	CBrush edit_brush_;
-public:
-	afx_msg void OnBnClickedButtonPay();
-private:
 	CStatic total_money_static_;
 	CStatic total_real_money_static_;
-
-	HACCEL acce_;
-
-	bool GetUserName(CString &name);
-	bool GetCommName(CString &name);
-public:
-	virtual BOOL PreTranslateMessage(MSG* pMsg);
-	afx_msg void OnAcceleratorTab();
-	afx_msg void OnAcceleratorEnter();
-
-	void SetErrorMsg(CString &error);
 	CStatic error_static_;
-
-	afx_msg LRESULT OnEditKillFocus(WPARAM wParam, LPARAM lParam);
-
-	bool GetCardName(CString &num, CString &name);
-	bool GetCommName(CString &num, CString &name);
-
-	struct CardInfo
-	{
-		CString card_num;
-		CString card_name;
-		CString card_type;
-	};
-
-	CardInfo card_info_;
-	bool GetCardInfo(CString num, CString &err_msg);
-
-	afx_msg void OnAcceleratorDown();
-	afx_msg void OnAcceleratorUp();
-	afx_msg void OnSetFocus(CWnd* pOldWnd);
-
-	void SortList();
-
-	void EmptyCtrl();
 	CStatic buyer_static_;
 	CEditBox buyer_card_edit_;
 	CEditBox buyer_name_edit_;
 	CButton swip_card_button_;
-	afx_msg void OnBnClickedButtonSwipCard();
-	//std::string card_num_;
-	//std::string card_type_;
+	CPen line_pen_;
+	CPoint line_point_[3];
+	CBrush edit_brush_;
-	void EnableCtrl(bool is_enable);
+	HACCEL acce_;
+
+	CString product_id_;
+	int buyer_card_type_;
+
+	std::vector<CommInfo> comm_vec_;
+	int comm_id_index_;
 };
@@ -141,9 +141,6 @@ void MenuResAuthMgr::DoUpdateAuth(const std::string&amp; auth_data)
 			auth_item.id = elem.second.get<uint32_t>("code");
 			auth_item.url_path = elem.second.get<std::string>("path");
 			auth_item.remark = str_2_wstr(elem.second.get<std::string>("name"));
-			/*auth_item.id = elem.second.get<uint32_t>("id");
-			auth_item.url_path = elem.second.get<std::string>("url_path");
-			auth_item.remark = str_2_wstr(elem.second.get<std::string>("remark"));*/
 			menu_auth_items.emplace_back(auth_item);
 		}
 	}
@@ -61,8 +61,11 @@ URLConfig::URLConfig()
 		m_user_msg_count_path = ptree.get<std::string>("user_msg_count_path");
 		m_user_msg_path = ptree.get<std::string>("user_msg_path");
 		m_modify_pwd_path = ptree.get<std::string>("modify_pwd_path");
-		m_get_card_name_path = ptree.get<std::string>("get_card_name");
-		
+		m_get_card_name_path = ptree.get<std::string>("get_card_name_path");
+		m_get_seller_card_path = ptree.get<std::string>("get_seller_card_path");
+		m_get_product_path = ptree.get<std::string>("get_product_name_path");
+		m_submit_orders_path = ptree.get<std::string>("submit_orders_path");
+		m_finish_order_path = ptree.get<std::string>("finish_order_path");
 	}
 	catch (...) // Catch the exception in order for logging.
 	{
@@ -94,6 +97,9 @@ void URLConfig::ModifyCfg(bool is_https, uint16_t port)
 		root.put("user_msg_path", m_user_msg_path);
 		root.put("modify_pwd_path", m_modify_pwd_path);
 		root.put("get_card_name_path", m_get_card_name_path);
+		root.put("get_product_name_path", m_get_product_path);
+		root.put("submit_orders_path", m_submit_orders_path);
+		root.put("finish_order_path", m_finish_order_path);
 		PT::write_json(ss, root, true);
 	}
 	catch (...) // Catch the exception in order for logging.
@@ -173,4 +179,16 @@ std::string URLConfig::PwdModificationPath() const
 std::string URLConfig::GetCardNamePath() const
 {
 	return m_get_card_name_path;
+}
+std::string URLConfig::GetCommNamePath() const
+{
+	return m_get_product_path;
+}
+std::string URLConfig::GetSubmitOrdersPath() const
+{
+	return m_submit_orders_path;
+}
+std::string URLConfig::GetSellerCardPath() const
+{
+	return m_get_seller_path;
 }
 \ No newline at end of file
@@ -30,6 +30,9 @@ public:
 	std::string UserMsgPath() const;
 	std::string PwdModificationPath() const;
 	std::string GetCardNamePath() const;
+	std::string GetCommNamePath() const;
+	std::string GetSubmitOrdersPath() const;
+	std::string GetSellerCardPath() const;
 private:
 	URLConfig();
 	URLConfig(const URLConfig&);
@@ -47,5 +50,10 @@ private:
 	std::string m_user_msg_path;
 	std::string m_modify_pwd_path;
 	std::string m_get_card_name_path;
+	std::string m_get_seller_card_path;
+	std::string m_get_seller_path;
+	std::string m_get_product_path;
+	std::string m_submit_orders_path;
+	std::string m_finish_order_path;
 };
 #endif // ETRADECLIENT_UTILITY_URL_CONFIG_H_INCLUDED
@@ -23,6 +23,7 @@
 #define WM_CEF_MSG_VIEW_CLOSE_BROWSER	(WM_USER + 117)
 #define WM_CRASH_CLOSE					(WM_USER + 118)
 #define WM_ORDER_KILL_FOCUS				(WM_USER + 119)
+#define WM_ORDER_DELETE_ORDER			(WM_USER + 120)
 #define WM_CEF_JS_CAMMAND_CLOSE_WND		(WM_USER + 301)
 #define WM_CEF_JS_CAMMAND_USER_RELOGIN	(WM_USER + 302)
@@ -68,33 +68,49 @@
 #define IDC_PAY_BUTTON_CLOSE            1051
 #define IDC_PAY_BUTTON_PAY              1052
 #define IDC_PAY_STATIC_REAL_MONEY       1053
-#define ID_PAY_FEE                      10001
-#define ID_ORDER                        10002
-#define ID_STATEMENT_MANAGE             10003
-#define ID_ORDERFORM_MANAGE             10004
+#define IDC_STATIC_ERROR_MSG            1054
+
+#define ID_ORDER                        10001
+#define ID_STATEMENT_MANAGE             10002
+#define ID_ORDERFORM_MANAGE             10003
+
 #define ID_EXIT                         11001
 #define ID_MODIFY_PASSWORD              11002
-#define ID_USER_MANAGE                  20001
-#define ID_ROLE_MANAGE                  20002
-#define ID_RIGHT_MANAGE                 20003
-#define ID_32845                        32845
+
+#define ID_COMM_REGIST                  20001
+#define ID_COMM_DISTRIB                 20002
+#define ID_QUERY_MANAGE                 20003
+
+#define ID_SPECIAL_HANDLE               30001
+
+#define ID_POINT_RULE                   40001
+#define ID_CATEGORY_RULE                40002
+#define ID_AGREEMENT                    40003
+#define ID_TAPE_HANDLE                  40004
+#define ID_CREDIT                       40005
+
+#define ID_USER_MANAGE                  50001
+#define ID_ROLE_MANAGE                  50002
+#define ID_PARAM_SET                    50003
+#define ID_LOG                          50004
+
 #define ID_MENU_DELETE                  32846
-#define ID_32847                        32847
 #define ID_POPMENU_LIST                 32848
-#define ID_32849                        32849
 #define ID_POPMENU_DELETE               32850
 #define ID_ACCELERATOR_TAB              32851
 #define ID_ACCELERATOR_ENTER            32852
 #define ID_ACCELERATOR_UP               32854
 #define ID_ACCELERATOR_DOWN             32855
+#define ID_ACCELERATOR_F11              32857
+
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        332
-#define _APS_NEXT_COMMAND_VALUE         32857
-#define _APS_NEXT_CONTROL_VALUE         1054
+#define _APS_NEXT_COMMAND_VALUE         32883
+#define _APS_NEXT_CONTROL_VALUE         1055
 #define _APS_NEXT_SYMED_VALUE           311
 #endif
 #endif