bugfix<central_clearing_system>:#15101&15095

修复临时卡支付时需要输入密码的问题；下单时增加对库存的检测；

bugfix<central_clearing_system>:#15101&15095
修复临时卡支付时需要输入密码的问题；下单时增加对库存的检测；
liuye
1 parent d4ce78b1
Showing 5 changed files with 61 additions and 11 deletions
central_clearing_system/ETradeClient.rc
central_clearing_system/ETradeClient/mfc_ui/pay_dlg.cpp
central_clearing_system/ETradeClient/mfc_ui/place_order_dlg.cpp
central_clearing_system/ETradeClient/mfc_ui/place_order_dlg.h
central_clearing_system/out/Win32/综合业务系统.zip
@@ -277,8 +277,8 @@ END
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,2
- PRODUCTVERSION 2,0,0,2
+ FILEVERSION 2,0,0,3
+ PRODUCTVERSION 2,0,0,3
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -295,12 +295,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "地利集团【DILI GROUP】"
             VALUE "FileDescription", "电子交易结算综合业务系统"
-            VALUE "FileVersion", "2.0.0.2"
-            VALUE "InternalName", "Central-Clearing-System_2.0.1.181024_beta"
+            VALUE "FileVersion", "2.0.0.3"
+            VALUE "InternalName", "Central-Clearing-System_2.0.3.181029_beta"
             VALUE "LegalCopyright", "(C) 地利集团。  保留所有权利。"
-            VALUE "OriginalFilename", "Central-Clearing-System_2.0.1.181024_beta"
-            VALUE "ProductName", "Central-Clearing-System_2.0.1.181024_beta"
-            VALUE "ProductVersion", "2.0.0.2"
+            VALUE "OriginalFilename", "Central-Clearing-System_2.0.3.181029_beta"
+            VALUE "ProductName", "Central-Clearing-System_2.0.3.181029_beta"
+            VALUE "ProductVersion", "2.0.0.3"
         END
     END
     BLOCK "VarFileInfo"
@@ -341,12 +341,14 @@ BEGIN
     IDD_DIALOG_PLACE_ORDER, DIALOG
     BEGIN
+        MOCKUP, 1, 50, -25, -30, "C:\Users\WangGY\Desktop\TIM图片20180918183513.png"
         RIGHTMARGIN, 337
         HORZGUIDE, 67
     END
     IDD_DIALOG_PAY, DIALOG
     BEGIN
+        MOCKUP, 1, 50, -5, -34, "C:\Users\WangGY\Desktop\无标题.png"
         LEFTMARGIN, 7
         RIGHTMARGIN, 222
         TOPMARGIN, 7
@@ -376,3 +376,4 @@ LRESULT PayDlg::OnSessionExpired(WPARAM wParam, LPARAM lParam)
 	Session::Instance().OnValid(); // If login succeeded, recover the session state to be "not expired".
 	return 0;
 }
+
@@ -30,6 +30,7 @@ PlaceOrderDlg::PlaceOrderDlg(CWnd* pParent /*=NULL*/)
 	edit_brush_.CreateSolidBrush(RGB(245, 247, 250));
 	comm_id_index_ = 1;
 	product_id_ = 0;
+	stock_amount_ = 0;
 }
 PlaceOrderDlg::~PlaceOrderDlg()
@@ -812,9 +813,9 @@ LRESULT PlaceOrderDlg::OnEditKillFocus(WPARAM wParam, LPARAM lParam)
 		{
 			((CEditBox*)GetDlgItem(dlg_id))->SetEditRed(true);
 		}
+		
 	}
 	case IDC_EDIT_PRICE:
-	case IDC_EDIT_COUNT:
 	{
 		if (text.IsEmpty())
 		{
@@ -833,8 +834,48 @@ LRESULT PlaceOrderDlg::OnEditKillFocus(WPARAM wParam, LPARAM lParam)
 			((CEditBox*)GetDlgItem(dlg_id))->SetEditRed(false);
 		}
-	
-		
+		break;
+	}
+	case IDC_EDIT_COUNT:
+	{
+		if (text.IsEmpty())
+		{
+			((CEditBox*)GetDlgItem(dlg_id))->SetEditRed(true);
+		}
+		else if (text.Right(1).Compare(L".") == 0)
+		{
+			((CEditBox*)GetDlgItem(dlg_id))->SetEditRed(true);
+		}
+		else if (!(_ttof(text) > 0))
+		{
+			((CEditBox*)GetDlgItem(dlg_id))->SetEditRed(true);
+		}
+		else
+		{
+			CString unit;
+			unit_edit_.GetWindowText(unit);
+			CString count;
+			count_edit_.GetWindowText(count);
+			if (unit.Compare(L"1") == 0 && _ttof(count) > stock_amount_)
+			{
+				SetErrorMsg(CString(L"错误信息：库存不足"));
+				((CEditBox*)GetDlgItem(dlg_id))->SetEditRed(true);
+			}
+			else if (unit.Compare(L"2") == 0)
+			{
+				CString heavy;
+				heavy_edit_.GetWindowText(heavy);
+				if (_ttof(count) * _ttof(heavy) > stock_amount_)
+				{
+					SetErrorMsg(CString(L"错误信息：库存不足"));
+					((CEditBox*)GetDlgItem(dlg_id))->SetEditRed(true);
+				}
+			}
+			else
+			{
+				((CEditBox*)GetDlgItem(dlg_id))->SetEditRed(false);
+			}
+		}
 		break;
 	}
 	}
@@ -915,7 +956,11 @@ bool PlaceOrderDlg::GetCardName(CString &amp;num, CString &amp;name, int type)
 			{
 				PT::ptree card_data = ptree.get_child("data");
 				name = str_2_wstr(card_data.get<std::string>("name")).c_str();
-				buyer_card_type_ = card_data.get<int>("category");
+				if (type == 1)
+				{
+					buyer_card_type_ = card_data.get<int>("category");
+				}
+				
 			}
 			else
 			{
@@ -1012,6 +1057,7 @@ bool PlaceOrderDlg::GetCommName(CString &amp;num, CString&amp; card, CString &amp;name, long
 				PT::ptree card_data = ptree.get_child("data");
 				name = str_2_wstr(card_data.get<std::string>("name")).c_str();
 				product_id = card_data.get<long>("id");
+				stock_amount_ = card_data.get<double>("stockAmount");
 			}
 			else
 			{
@@ -117,6 +117,7 @@ private:
 	long product_id_;
 	int buyer_card_type_;
+	double stock_amount_;
 	std::vector<CommInfo> comm_vec_;
 	int comm_id_index_;