liuye / etradeclient · Commits

Commit 2dfe035d97d439ce3faeb3ff33b2a72a898f857e

Authored by liuye
1 parent 8abd82cd
build: skipped

feat<central>下单，快捷码支持3或4位，并修改了下单部分逻辑错误 

Signed-off-by: liuye <liuye@diligrp.com>
Inline Side-by-side
Showing 3 changed files with 16 additions and 15 deletions
central_clearing_system/ETradeClient.rc
  View file @2dfe035
... ... @@ -286,8 +286,8 @@ END
286 286 //
287 287  
288 288 VS_VERSION_INFO VERSIONINFO
289   - FILEVERSION 2,0,0,13
290   - PRODUCTVERSION 2,0,0,13
  289 + FILEVERSION 2,0,0,14
  290 + PRODUCTVERSION 2,0,0,14
291 291 FILEFLAGSMASK 0x3fL
292 292 #ifdef _DEBUG
293 293 FILEFLAGS 0x1L
... ... @@ -304,12 +304,12 @@ BEGIN
304 304 BEGIN
305 305 VALUE "CompanyName", "地利集团【DILI GROUP】"
306 306 VALUE "FileDescription", "电子交易结算综合业务系统"
307   - VALUE "FileVersion", "2.0.0.13"
308   - VALUE "InternalName", "Central-Clearing-System_2.0.13.181121_Beta"
  307 + VALUE "FileVersion", "2.0.0.14"
  308 + VALUE "InternalName", "Central-Clearing-System_2.0.14.181121_Beta"
309 309 VALUE "LegalCopyright", "(C) 地利集团保留所有权利。"
310   - VALUE "OriginalFilename", "Central-Clearing-System_2.0.13.181121_Beta"
311   - VALUE "ProductName", "Central-Clearing-System_2.0.13.181121_Beta"
312   - VALUE "ProductVersion", "2.0.0.13"
  310 + VALUE "OriginalFilename", "Central-Clearing-System_2.0.14.181121_Beta"
  311 + VALUE "ProductName", "Central-Clearing-System_2.0.14.181121_Beta"
  312 + VALUE "ProductVersion", "2.0.0.14"
313 313 END
314 314 END
315 315 BLOCK "VarFileInfo"
... ...
central_clearing_system/ETradeClient/mfc_ui/etrade_edit_control.cpp
  View file @2dfe035
... ... @@ -132,12 +132,6 @@ bool CEditBox::CheckCardNum(CString num)
132 132  
133 133 do
134 134 {
135   - /*if (num.GetLength() > 12)
136   - {
137   - result = false;
138   - break;
139   - }*/
140   -
141 135 if (num.SpanIncluding(L"0123456789") != num)
142 136 {
143 137 result = false;
... ... @@ -154,7 +148,7 @@ bool CEditBox::CheckCommNum(CString num)
154 148  
155 149 do
156 150 {
157   - if (num.GetLength() > 3)
  151 + if (num.GetLength() > 4)
158 152 {
159 153 result = false;
160 154 break;
... ...
central_clearing_system/ETradeClient/mfc_ui/place_order_dlg.cpp
  View file @2dfe035
... ... @@ -756,6 +756,7 @@ LRESULT PlaceOrderDlg::OnEditKillFocus(WPARAM wParam, LPARAM lParam)
756 756 if (text.IsEmpty())
757 757 {
758 758 card_edit_.SetEditRed(true);
  759 + name_edit_.SetWindowText(L"");
759 760 break;
760 761 }
761 762  
... ... @@ -768,6 +769,7 @@ LRESULT PlaceOrderDlg::OnEditKillFocus(WPARAM wParam, LPARAM lParam)
768 769 else
769 770 {
770 771 SetErrorMsg(name);
  772 + name_edit_.SetWindowText(L"");
771 773 card_edit_.SetEditRed(true);
772 774 }
773 775  
... ... @@ -779,6 +781,7 @@ LRESULT PlaceOrderDlg::OnEditKillFocus(WPARAM wParam, LPARAM lParam)
779 781 if (text.GetLength() < 3)
780 782 {
781 783 comm_num_edit_.SetEditRed(true);
  784 + comm_name_edit_.SetWindowText(L"");
782 785 break;
783 786 }
784 787 CString seller_card;
... ... @@ -791,7 +794,7 @@ LRESULT PlaceOrderDlg::OnEditKillFocus(WPARAM wParam, LPARAM lParam)
791 794 }
792 795 else
793 796 {
794   - //SetErrorMsg(name);
  797 + comm_name_edit_.SetWindowText(L"");
795 798 comm_num_edit_.SetEditRed(true);
796 799 }
797 800  
... ... @@ -1329,6 +1332,10 @@ void PlaceOrderDlg::OnBnClickedButtonSwipCard()
1329 1332  
1330 1333 buyer_card_edit_.SetWindowText(L"");
1331 1334 buyer_name_edit_.SetWindowText(L"");
  1335 +
  1336 + EnableCtrl(false);
  1337 + comm_vec_.clear();
  1338 +
1332 1339 break;
1333 1340 }
1334 1341  
... ...