feat<central_clearing_system>:完成下单流程和打印功能的调试

喜大普奔！！！

feat<central_clearing_system>:完成下单流程和打印功能的调试
喜大普奔！！！
liuye
1 parent 3dae8957
Showing 21 changed files with 171 additions and 75 deletions
central_clearing_system/Config/application_config.json
central_clearing_system/Config/url_cfg.json
central_clearing_system/ETradeClient.rc
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/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
central_clearing_system/ETradeClient/utility/url_config.cpp
central_clearing_system/ETradeClient/utility/url_config.h
central_clearing_system/Resource.h
etrade_card_client/Config/menu_res_auth_cfg.json
etrade_card_client/ETradeClient.rc
@@ -4,7 +4,7 @@
 	"pwd_machine_port": 54102,
 	"pwd_machine_timeout": 10000,
 	"pin_pad_pwd_len": 6,
-	"pin_pad_timeout": 2,
+	"pin_pad_timeout": 30,
 	"client_cert_store": "MY",
 	"client_cert_subject": "*.diligrp.com",
 	"client_cert_filename": "",
 {
 	"protocol": "http",
 	"host": "xtrade.esc.diligrp.com",
-	"port": 8080,
+	"port": 8082,
 	"main_path": "/iset/oauth/clientInitMain.iset",
     "login_path": "/iset/oauth/login.auth",
     "logout_path": "/iset/oauth/logout.auth",
@@ -148,9 +148,14 @@ IDR_ACCELERATOR_ORDER ACCELERATORS
 BEGIN
     VK_DOWN,        ID_ACCELERATOR_DOWN,    VIRTKEY, NOINVERT
     VK_RETURN,      ID_ACCELERATOR_ENTER,   VIRTKEY, NOINVERT
+    VK_F11,         ID_ACCELERATOR_F11,     VIRTKEY, NOINVERT
     VK_TAB,         ID_ACCELERATOR_TAB,     VIRTKEY, NOINVERT
     VK_UP,          ID_ACCELERATOR_UP,      VIRTKEY, NOINVERT
-    VK_F11,         ID_ACCELERATOR_F11,     VIRTKEY, NOINVERT
+    "S",            ID_ACCELERATOR_S,       VIRTKEY, NOINVERT
+    "S",            ID_ACCELERATOR_ALT_S,   VIRTKEY, ALT, NOINVERT
+    "A",            ID_ACCELERATOR_A,       VIRTKEY, NOINVERT
+    "F",            ID_ACCELERATOR_F,       VIRTKEY, NOINVERT
+    "X",            ID_ACCELERATOR_X,       VIRTKEY, NOINVERT
 END
@@ -259,7 +264,7 @@ BEGIN
     LTEXT           "",IDC_PAY_STATIC_MONEY,73,20,8,8
     LTEXT           "密   码：",IDC_PAY_STATIC_PASSWORD,18,50,31,8
     EDITTEXT        IDC_PAY_EDIT_PASSWORD,56,46,40,14,ES_PASSWORD | ES_AUTOHSCROLL
-    PUSHBUTTON      "输入密码(&A)",IDC_PAY_BUTTON_PASSWORD,151,51,71,18
+    PUSHBUTTON      "输入密码(&X)",IDC_PAY_BUTTON_PASSWORD,151,51,71,18
     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
@@ -337,6 +342,7 @@ BEGIN
     IDD_DIALOG_PLACE_ORDER, DIALOG
     BEGIN
+        MOCKUP, 1, 50, -25, -30, "C:\Users\WangGY\Desktop\TIM图片20180918183513.png"
         RIGHTMARGIN, 337
         HORZGUIDE, 67
     END
@@ -1327,7 +1327,7 @@ int StylusPrinterCmd::Print(std::vector&lt;OrderInfo&gt; &amp;order_vector)
 	const int NormalPageCommCount = 10;	//非第一页和最后一页，其他页的商品数目
 	const int LastPageCommCount = 9;	//最后一页最多商品数量
-	const int TitleCtrlHIBig = 900;		//表头不同组别控件横向间隔
+	const int TitleCtrlHIBig = 700;		//表头不同组别控件横向间隔
 	const int TitleCtrlHISmall = 150;	//表头同组别控件横向间隔
 	const int TitleCtrlVI = 50;			//表头控件纵向间隔
 	const int LineStartX = 100;			//横线起点x坐标
@@ -1542,22 +1542,22 @@ std::string StylusPrinterCmd::ParseInput(std::string &amp;input, std::vector&lt;OrderIn
 		{
 			OrderInfo order;
 			order.doc_name = title.c_str();
-			order.statements_no = str_2_wstr(v.second.get<std::string>(JSON_TAG_STATEMENT_ID)).c_str();
-			order.trade_time = str_2_wstr(v.second.get<std::string>(JSON_TAG_TRADE_TIME)).c_str();
-			order.buyer_name = str_2_wstr(v.second.get<std::string>(JSON_TAG_TRADE_BUYER_NAME)).c_str();
-			order.seller_name = str_2_wstr(v.second.get<std::string>(JSON_TAG_TRADE_SELLER_NAME)).c_str();
-			order.settlement_clerk = str_2_wstr(v.second.get<std::string>(JSON_TAG_TRADE_USER_NAME)).c_str();
-			order.total_money = str_2_wstr(v.second.get<std::string>(JSON_TAG_TRADE_TOTAL_MONEY)).c_str();
+			order.statements_no = v.second.get<std::string>(JSON_TAG_STATEMENT_ID).c_str();
+			order.trade_time = v.second.get<std::string>(JSON_TAG_TRADE_TIME).c_str();
+			order.buyer_name = v.second.get<std::string>(JSON_TAG_TRADE_BUYER_NAME).c_str();
+			order.seller_name = v.second.get<std::string>(JSON_TAG_TRADE_SELLER_NAME).c_str();
+			order.settlement_clerk = v.second.get<std::string>(JSON_TAG_TRADE_USER_NAME).c_str();
+			order.total_money = v.second.get<std::string>(JSON_TAG_TRADE_TOTAL_MONEY).c_str();
 			PT::ptree products_ptree = v.second.get_child(JSON_TAG_TRADE_PRODUCTS);
 			BOOST_FOREACH(PT::ptree::value_type &v, products_ptree)
 			{
 				CommInfo comm_info;
 				comm_info.comm_id = v.second.get<long>(JSON_TAG_ORDER_ID);
-				comm_info.comm_name = str_2_wstr(v.second.get<std::string>(JSON_TAG_PRODUCT_NAME)).c_str();
-				comm_info.price = str_2_wstr(v.second.get<std::string>(JSON_TAG_PRICE)).c_str();
-				comm_info.count = str_2_wstr(v.second.get<std::string>(JSON_TAG_AMOUNT)).c_str();
-				comm_info.total_money = str_2_wstr(v.second.get<std::string>(JSON_TAG_MONEY)).c_str();
+				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();
+				comm_info.total_money = v.second.get<std::string>(JSON_TAG_MONEY).c_str();
 				order.comm_vector.push_back(comm_info);
 			}
 			order_vector.push_back(order);
@@ -123,7 +123,7 @@ public:
 	virtual Reply Execute(const std::string& input) override;
 private:
-	bool ParseInput(std::string &input, std::vector<OrderInfo> &order_vector);
+	std::string ParseInput(std::string &input, std::vector<OrderInfo> &order_vector);
 	int Print(std::vector<OrderInfo> &order_vector);
 };
 //
@@ -55,7 +55,7 @@ LONG WINAPI ExceptionHandler(PEXCEPTION_POINTERS ExceptionPointer)
 		stuDump.ThreadId = GetCurrentThreadId();
 		stuDump.ExceptionPointers = ExceptionPointer;
 		stuDump.ClientPointers = FALSE;
-		MINIDUMP_TYPE emDumpType = MiniDumpWithFullMemory;
+		MINIDUMP_TYPE emDumpType = MiniDumpNormal;
 		BOOL bCreateDump = MiniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(), hFile, emDumpType, (ExceptionPointer != 0) ? &stuDump : 0, 0, 0);
 		if (!bCreateDump)
@@ -79,7 +79,7 @@ LONG WINAPI ExceptionHandler(PEXCEPTION_POINTERS ExceptionPointer)
 // Replace application ID string below with unique ID string; recommended
 // format for string is CompanyName.ProductName.SubProduct.VersionInformation
-static const wchar_t* APP_ID = L"DILIGROUP.CentralClearingSystem.V1.0";
+static const wchar_t* APP_ID = L"DILIGROUP.CentralClearingSystem.V2.0";
 // CETradeClientApp
@@ -77,7 +77,7 @@ void CGridCellBase::Reset()
 	m_MergeCellID.row=-1;
 	m_MergeCellID.col=-1;
-	product_id.clear();
+	product_id = 0;
 	data_id = 0;
 }
 //Used for merge cells,remove const
@@ -184,7 +184,7 @@ private:
 public:
 	//为了业务，为了部落，为了该死的product_id
-	std::string product_id;
+	long product_id;
 	int data_id;
 	//
 };
@@ -4625,7 +4625,7 @@ BOOL CGridCtrl::GetItem(GV_ITEM* pItem)
     return TRUE;
 }
-BOOL CGridCtrl::SetItemText(int nRow, int nCol, LPCTSTR str, int data_id, std::string product_id)
+BOOL CGridCtrl::SetItemText(int nRow, int nCol, LPCTSTR str, int data_id, long product_id)
 {
     if (GetVirtualMode())
         return FALSE;
@@ -366,7 +366,7 @@ public:
     BOOL   SetItem(const GV_ITEM* pItem);
     BOOL   GetItem(GV_ITEM* pItem);
-    BOOL   SetItemText(int nRow, int nCol, LPCTSTR str, int data_id = 0, std::string product_id = "");
+    BOOL   SetItemText(int nRow, int nCol, LPCTSTR str, int data_id = 0, long product_id = 0);
     // 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;
@@ -221,6 +221,17 @@ bool CEditBox::CheckHeavy(CString heavy)
 			result = false;
 			break;
 		}
+
+		//首位为0时，次首位只能是小数点
+		if (length == 2 && heavy.Left(1) == "0")
+		{
+			if (heavy.Right(1) != ".")
+			{
+				result = false;
+				break;
+			}
+		}
+
 		//只有一个小数点
 		if (heavy.Replace(L".", L".") > 1)
 		{
@@ -272,6 +283,17 @@ bool CEditBox::CheckPrice(CString price)
 			result = false;
 			break;
 		}
+
+		//首位为0时，次首位只能是小数点
+		if (length == 2 && price.Left(1) == "0")
+		{
+			if (price.Right(1) != ".")
+			{
+				result = false;
+				break;
+			}
+		}
+
 		//只有一个小数点
 		if (price.Replace(L".", L".") > 1)
 		{
@@ -56,6 +56,9 @@ BEGIN_MESSAGE_MAP(PayDlg, CDialogEx)
 	ON_BN_CLICKED(IDC_PAY_BUTTON_PAY, &PayDlg::OnBnClickedPayButtonPay)
 	ON_WM_CTLCOLOR()
 	ON_BN_CLICKED(IDC_PAY_BUTTON_PASSWORD, &PayDlg::OnBnClickedPayButtonPassword)
+	ON_COMMAND(ID_ACCELERATOR_A, &PayDlg::OnBnClickedPayButtonPassword)
+	ON_COMMAND(ID_ACCELERATOR_F, &PayDlg::OnBnClickedPayButtonPay)
+	ON_COMMAND(ID_ACCELERATOR_X, &PayDlg::OnBnClickedPayButtonClose)
 END_MESSAGE_MAP()
@@ -82,6 +85,8 @@ BOOL PayDlg::OnInitDialog()
 		password_button_.ShowWindow(SW_SHOW);
 	}
+	acce_ = LoadAccelerators(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_ACCELERATOR_ORDER));
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	// 异常:  OCX 属性页应返回 FALSE
 }
@@ -157,21 +162,30 @@ void PayDlg::OnBnClickedPayButtonClose()
 void PayDlg::OnBnClickedPayButtonPay()
 {
-	
+	LOG_TRACE(L"支付订单");
 	CString error_msg;
 	std::string statement_data;
 	do
 	{
+		CString pass_word;
+		password_edit_.GetWindowText(pass_word);
+		if (card_type_ != 30)
+		{
+			if (pass_word.IsEmpty() || pass_word.GetLength() < 6)
+			{
+				SetErrorMsg(L"错误提示：密码为空或密码长度不足！");
+				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());
-		std::string url = url_cfg.GetSubmitOrdersPath();
-		auto& request = win_http.OpenRequest(WinHttp::Method::POST, url);
-
-		CString pass_word;
-		password_edit_.GetWindowText(pass_word);
+		std::string url = url_cfg.GetFinishStatementPath();
+		auto& request = win_http.OpenRequest(WinHttp::Method::JSONPOST, url);
 		std::ostringstream os;
 		os << statement_id_;
@@ -179,7 +193,7 @@ void PayDlg::OnBnClickedPayButtonPay()
 		std::istringstream is(os.str());
 		is >> statement_id_str;
-		std::string post_data = "{\"statementId\":" + statement_id_str + "\"password\":\"" + wstr_2_str(pass_word) + "\"}";
+		std::string post_data = "{\"statementId\":" + statement_id_str + ",\"password\":\"" + wstr_2_str(pass_word) + "\"}";
 		request.SetPostData(post_data);
 		if (url_cfg.IsHttps())
@@ -193,7 +207,7 @@ void PayDlg::OnBnClickedPayButtonPay()
 		if (kHTTPOK != status_code)
 		{
 			std::string err_msg = "网络请求错误！ 错误码: " + std::to_string(status_code);
-			LOG_ERROR(str_2_wstr(err_msg.c_str()));
+			LOG_ERROR(CString(err_msg.c_str()).GetBuffer());
 			error_msg = err_msg.c_str();
 			break;
 		}
@@ -215,7 +229,11 @@ void PayDlg::OnBnClickedPayButtonPay()
 			PT::read_json(ss, ptree);
 			if (ptree.get<long>("code") == 0)
 			{
-				statement_data = ptree.get<std::string>("data");
+				PT::ptree data_child = ptree.get_child("data");
+				std::ostringstream os;
+				PT::write_json(os, data_child);
+				CString data = str_2_wstr(std::string(os.str())).c_str();
+				statement_data = CT2A(data);
 			}
 			else
 			{
@@ -268,6 +286,7 @@ HBRUSH PayDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
 void PayDlg::OnBnClickedPayButtonPassword()
 {
+	password_edit_.SetWindowTextW(L"");
 	auto pin_pad = ReadPINPadCmd();
 	HardwareCmd::Reply reply = pin_pad.Execute("");
 	CString error_msg;
@@ -307,5 +326,22 @@ void PayDlg::OnBnClickedPayButtonPassword()
 	if (!error_msg.IsEmpty())
 	{
 		SetErrorMsg(error_msg);
+		password_edit_.SetWindowTextW(L"");
+	}
+	else
+	{
+		SetErrorMsg(CString(L""));
 	}
 }
+
+
+BOOL PayDlg::PreTranslateMessage(MSG* pMsg)
+{
+	if (WM_KEYFIRST <= pMsg->message&&pMsg->message <= WM_KEYLAST)
+	{
+		if (acce_ && ::TranslateAccelerator(m_hWnd, acce_, pMsg))
+			return TRUE;
+	}
+
+	return CDialogEx::PreTranslateMessage(pMsg);
+}
@@ -43,6 +43,9 @@ private:
 	long statement_id_;
 	CString total_money_;
 	int card_type_;
+
+	HACCEL acce_;
 public:
 	afx_msg void OnBnClickedPayButtonPassword();
+	virtual BOOL PreTranslateMessage(MSG* pMsg);
 };
@@ -28,6 +28,7 @@ PlaceOrderDlg::PlaceOrderDlg(CWnd* pParent /*=NULL*/)
 	line_pen_.CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
 	edit_brush_.CreateSolidBrush(RGB(245, 247, 250));
 	comm_id_index_ = 1;
+	product_id_ = 0;
 }
 PlaceOrderDlg::~PlaceOrderDlg()
@@ -70,6 +71,7 @@ BEGIN_MESSAGE_MAP(PlaceOrderDlg, CDialogEx)
 	ON_WM_PAINT()
 	ON_WM_CTLCOLOR()
 	ON_BN_CLICKED(IDC_BUTTON_PAY, &PlaceOrderDlg::OnBnClickedButtonPay)
+	ON_COMMAND(ID_ACCELERATOR_S, &PlaceOrderDlg::OnBnClickedButtonPay)
 	ON_COMMAND(ID_ACCELERATOR_TAB, &PlaceOrderDlg::OnAcceleratorTab)
 	ON_COMMAND(ID_ACCELERATOR_ENTER, &PlaceOrderDlg::OnAcceleratorEnter)
 	ON_MESSAGE(WM_ORDER_KILL_FOCUS, &PlaceOrderDlg::OnEditKillFocus)
@@ -356,6 +358,7 @@ HBRUSH PlaceOrderDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
 void PlaceOrderDlg::OnBnClickedButtonPay()
 {
+	LOG_TRACE(L"Ìá½»¶©µ¥");
 	SetErrorMsg(CString(L""));
 	int row_count = product_list_.GetRowCount();
 	if (row_count == 1)
@@ -394,7 +397,7 @@ void PlaceOrderDlg::OnBnClickedButtonPay()
 		Comm comm_info;
 		CGridCellBase* product_cell = product_list_.GetCell(row, 2);
-		comm_info.product_id = product_cell->product_id;
+		comm_info.product_id = std::to_string(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";
@@ -497,7 +500,7 @@ void PlaceOrderDlg::OnBnClickedButtonPay()
 		EmptyCtrl(true);
 		SetCtrlInitData();
 		InitList();
-		comm_id_index_;
+		comm_id_index_ = 1;
 		comm_vec_.clear();
 		PayDlg pay_dlg(statement_id, CString(total_money.c_str()), buyer_card_type_);
@@ -590,60 +593,63 @@ void PlaceOrderDlg::OnAcceleratorEnter()
 			break;
 		}
-		int row_index = product_list_.InsertRow(L"", -1);
-		product_list_.Invalidate();
 		CString text;
 		double price = 0, count = 0;
 		card_edit_.GetWindowText(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);
 		comm.seller_name = text;
-		product_list_.SetItemText(row_index, 1, text, comm.comm_id);
 		text.Empty();
-
 		comm_name_edit_.GetWindowText(text);
 		comm.comm_name = text;
-		product_list_.SetItemText(row_index, 2, text, comm.comm_id, wstr_2_str(product_id_));
+		comm.product_id = product_id_;
 		text.Empty();
-
 		price_edit_.GetWindowText(text);
 		price = _ttof(text);
 		comm.price = text;
-		product_list_.SetItemText(row_index, 3, text, comm.comm_id);
 		text.Empty();
-
 		count_edit_.GetWindowText(text);
 		count = _ttof(text);
 		comm.count = text;
-		product_list_.SetItemText(row_index, 4, text, comm.comm_id);
 		text.Empty();
-
 		real_unit_static.GetWindowText(text);
 		comm.unit = text;
-		product_list_.SetItemText(row_index, 5, text, comm.comm_id);
 		text.Empty();
-
 		heavy_edit_.GetWindowText(text);
 		comm.weight = text;
-		product_list_.SetItemText(row_index, 6, text, comm.comm_id);
 		text.Empty();
-		text.Format(_T("%.1f"), price * count);
-		comm.total_money = text;
-		product_list_.SetItemText(row_index, 7, text, comm.comm_id);
+		double money = price * count * 100;
+		money = std::round(money) / 100;
+		text.Format(_T("%.2f"), money);
+		comm.total_money = text;
 		comm_vec_.push_back(comm);
-		
-		for (int index = 0; index < 8; ++index)
+
+		product_list_.DeleteAllItems();
+
+		InitList();
+
+		for (int index = 0; index != comm_vec_.size(); ++index)
 		{
-			product_list_.SetItemFormat(row_index, index, DT_CENTER | DT_VCENTER | DT_SINGLELINE);
+			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, comm_vec_[index].product_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);
+			}
 		}
-
+		
 		EmptyCtrl(false);
 		SortList();
@@ -670,7 +676,7 @@ void PlaceOrderDlg::OnAcceleratorEnter()
 	{
 		pay_button_.EnableWindow(FALSE);
 	}
-
+	product_list_.Invalidate(TRUE);
 	UpdateWindow();
 }
@@ -713,11 +719,11 @@ LRESULT PlaceOrderDlg::OnEditKillFocus(WPARAM wParam, LPARAM lParam)
 	case IDC_EDIT_CARD:
 	{
 		CString name;
-		/*if (text.GetLength() < 12)
+		if (text.IsEmpty())
 		{
-		card_edit_.SetEditRed(true);
-		break;
-		}*/
+			card_edit_.SetEditRed(true);
+			break;
+		}
 		bool result = GetCardName(text, name, 2);
 		if (result)
@@ -785,6 +791,10 @@ LRESULT PlaceOrderDlg::OnEditKillFocus(WPARAM wParam, LPARAM lParam)
 		{
 			break;
 		}
+		else if(!(_ttof(text) > 0))
+		{
+			((CEditBox*)GetDlgItem(dlg_id))->SetEditRed(true);
+		}
 	}
 	case IDC_EDIT_PRICE:
 	case IDC_EDIT_COUNT:
@@ -797,10 +807,16 @@ LRESULT PlaceOrderDlg::OnEditKillFocus(WPARAM wParam, LPARAM lParam)
 		{
 			((CEditBox*)GetDlgItem(dlg_id))->SetEditRed(true);
 		}
+		else if (!(_ttof(text) > 0))
+		{
+			((CEditBox*)GetDlgItem(dlg_id))->SetEditRed(true);
+		}
 		else
 		{
 			((CEditBox*)GetDlgItem(dlg_id))->SetEditRed(false);
 		}
+
+	
 		break;
 	}
@@ -870,6 +886,7 @@ bool PlaceOrderDlg::GetCardName(CString &amp;num, CString &amp;name, int type)
 			else
 			{
 				std::wstring error_msg = str_2_wstr(ptree.get<std::string>("message"));
+				LOG_ERROR(error_msg);
 				name = error_msg.c_str();
 				result = false;
 				break;
@@ -888,7 +905,7 @@ bool PlaceOrderDlg::GetCardName(CString &amp;num, CString &amp;name, int type)
 	return result;
 }
-bool PlaceOrderDlg::GetCommName(CString &num, CString& card, CString &name, CString &product_id)
+bool PlaceOrderDlg::GetCommName(CString &num, CString& card, CString &name, long &product_id)
 {
 	SetErrorMsg(CString(L""));
 	bool result = true;
@@ -942,13 +959,13 @@ bool PlaceOrderDlg::GetCommName(CString &amp;num, CString&amp; card, CString &amp;name, CStr
 			{
 				PT::ptree card_data = ptree.get_child("data");
 				name = str_2_wstr(card_data.get<std::string>("name")).c_str();
-				long id = card_data.get<long>("id");
-				product_id.Format(L"%ld", id);
+				product_id = card_data.get<long>("id");
 			}
 			else
 			{
-				std::wstring error_msg = str_2_wstr(ptree.get<std::string>("message"));
-				error_msg = CString(error_msg.c_str());
+				std::wstring err_msg = str_2_wstr(ptree.get<std::string>("message"));
+				LOG_ERROR(err_msg);
+				error_msg = CString(err_msg.c_str());
 				result = false;
 				break;
 			}
@@ -1210,6 +1227,8 @@ void PlaceOrderDlg::OnBnClickedButtonSwipCard()
 	else
 	{
 		SetErrorMsg(CString(L""));
+		card_edit_.SetFocus();
+		card_edit_.SetSel(4, 4);
 	}
@@ -1258,7 +1277,7 @@ afx_msg LRESULT PlaceOrderDlg::DeleteComm(WPARAM wParam, LPARAM lParam)
 		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, 2, comm_vec_[index].comm_name, comm_vec_[index].comm_id, comm_vec_[index].product_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);
@@ -27,6 +27,7 @@ class PlaceOrderDlg : public CDialogEx
 	struct CommInfo
 	{
 		int comm_id;
+		long product_id;
 		CString seller_card;
 		CString seller_name;
 		CString comm_name;
@@ -80,9 +81,7 @@ private:
 	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);
-
-
+	bool GetCommName(CString &num, CString& card, CString &name, long &product_id);
 private:
 	CStatic owner_static_;
 	CEditBox card_edit_;
@@ -115,7 +114,7 @@ private:
 	HACCEL acce_;
-	CString product_id_;
+	long product_id_;
 	int buyer_card_type_;
 	std::vector<CommInfo> comm_vec_;
@@ -192,4 +192,8 @@ std::string URLConfig::GetSubmitOrdersPath() const
 std::string URLConfig::GetSellerCardPath() const
 {
 	return m_get_seller_card_path;
+}
+std::string URLConfig::GetFinishStatementPath() const
+{
+	return m_finish_order_path;
 }
 \ No newline at end of file
@@ -33,6 +33,7 @@ public:
 	std::string GetCommNamePath() const;
 	std::string GetSubmitOrdersPath() const;
 	std::string GetSellerCardPath() const;
+	std::string GetFinishStatementPath() const;
 private:
 	URLConfig();
 	URLConfig(const URLConfig&);
@@ -86,6 +86,11 @@
 #define ID_ACCELERATOR_UP               32854
 #define ID_ACCELERATOR_DOWN             32855
 #define ID_ACCELERATOR_F11              32857
+#define ID_ACCELERATOR_S                32883
+#define ID_ACCELERATOR_ALT_S            32884
+#define ID_ACCELERATOR_A                32885
+#define ID_ACCELERATOR_F                32886
+#define ID_ACCELERATOR_X                32887
 #define ID_POINT_RULE                   40001
 #define ID_CATEGORY_RULE                40002
 #define ID_AGREEMENT                    40003
@@ -101,7 +106,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        332
-#define _APS_NEXT_COMMAND_VALUE         32883
+#define _APS_NEXT_COMMAND_VALUE         32889
 #define _APS_NEXT_CONTROL_VALUE         1055
 #define _APS_NEXT_SYMED_VALUE           311
 #endif
@@ -26,7 +26,7 @@
 	{"res_id":50190, 	"auth_id":5517, "icon":"about.ico", 					"index":[3, 4]},
     {"res_id":4, 		"auth_id":60, 	"icon":"", 								"index":[4]},
     {"res_id":50180, 	"auth_id":6004, "icon":"customer_query.ico", 			"index":[4, 0]},
-    {"res_id":50190, 	"auth_id":6008, "icon":"oper_log_query.ico", 			"index":[4, 1]},
+    {"res_id":50185, 	"auth_id":6008, "icon":"oper_log_query.ico", 			"index":[4, 1]},
 	{"res_id":50181, 	"auth_id":6009, "icon":"about.ico", 					"index":[4, 2]},
 	{"res_id":5, 		"auth_id":70, 	"icon":"", 								"index":[5]},
 	{"res_id":50182, 	"auth_id":7002, "icon":"about.ico", 					"index":[5, 0]},
@@ -122,7 +122,7 @@ BEGIN
     POPUP "查询业务(&C)"
     BEGIN
         MENUITEM "客户查询",                        ID_CUSTOMER_QUERY
-        MENUITEM "操作记录",                        ID_ACCOUNT_TRANSFER
+        MENUITEM "操作记录",                        ID_OPERATING_RECORD
         MENUITEM "客户管理",                        ID_CUS_MANAGE
     END
     POPUP "市场业务(&F)"
@@ -58,12 +58,13 @@
 #define ID_CASH_WITHDRAW                50150
 #define ID_FEE_PAYMENT                  50160
 #define ID_SETTLE_ACCOUNTS_APPLY        50170
-#define ID_ACCOUNT_TRANSFER             50190
 #define ID_CUSTOMER_QUERY               50180
+#define ID_OPERATING_RECORD             50185
 #define ID_CUS_MANAGE                   50181
 #define ID_ETC_QUERY                    50182
 #define ID_ETC_SERVICE                  50183
 #define ID_KING_CARD                    50184
+#define ID_ACCOUNT_TRANSFER             50190
 #define ID_OPER_LOG_QUERY               50190
 #define ID_INDICATOR_TIME               59142
@@ -72,7 +73,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        326
-#define _APS_NEXT_COMMAND_VALUE         32840
+#define _APS_NEXT_COMMAND_VALUE         32842
 #define _APS_NEXT_CONTROL_VALUE         1018
 #define _APS_NEXT_SYMED_VALUE           311
 #endif