feat<card>:支持扣点收费

支持一个按钮同时刷园区卡银行卡，新增账户转账、王卡业务菜单

feat<card>:支持扣点收费
支持一个按钮同时刷园区卡银行卡，新增账户转账、王卡业务菜单
liuye
1 parent a39f9aed
Showing 9 changed files with 103 additions and 61 deletions
central_clearing_system/Config/menu_res_auth_cfg.json
central_clearing_system/ETradeClient/hardware/dili_card_device.cpp
central_clearing_system/ETradeClient/mfc_ui/ETradeClient.cpp
etrade_card_client/Config/menu_res_auth_cfg.json
etrade_card_client/ETradeClient.rc
etrade_card_client/ETradeClient/hardware/dili_card_device.cpp
etrade_card_client/ETradeClient/hardware/hardware_cmd.cpp
etrade_card_client/ETradeClient/hardware/hardware_cmd.h
etrade_card_client/resource.h
 [
-    {"res_id":1, 		"auth_id":1000, 	  "icon":"", 				"index":[0]},
-    {"res_id":10001, 	"auth_id":100001,     "icon":"trade.ico", 		"index":[0, 0]},
+    {"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":2, 		"auth_id":1010, 	  "icon":"", 				"index":[1]},
+	{"res_id":10003, 	"auth_id":100003,     "icon":"statement_manage.ico", 	"index":[0, 2]},
+	{"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":20003, 	"auth_id":101003,     "icon":"role_manage.ico", 		"index":[1, 2]},
 	{"res_id":30001, 	"auth_id":103001,     "icon":"role_manage.ico", 		"index":[2]},
-	{"res_id":4, 		"auth_id":1020, 	  "icon":"", 				"index":[3]},
+	{"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":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":[]}
+	{"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
@@ -417,23 +417,6 @@ namespace DILICard
 	//------Private Implementations----------------
 	void RWDevice::Init()
 	{
-		//const std::wstring kDLLFile = L"./dyn.dll";
-		//HINSTANCE dll_handle = LoadLibrary(kDLLFile.c_str());
-		//if (NULL != dll_handle)
-		//{
-		//	m_fn_open = (OpenFn)GetProcAddress(dll_handle, "open");
-		//	m_fn_beep = (BeepFn)GetProcAddress(dll_handle, "beep");
-		//	m_fn_close = (CloseFn)GetProcAddress(dll_handle, "close");
-		//	m_fn_find_card = (FindCardFn)GetProcAddress(dll_handle, "findCard");
-		//	m_fn_write_bin_data = (WriteBinaryDataFn)GetProcAddress(dll_handle, "write_bin_file");
-		//	m_fn_get_value = (GetValueFn)GetProcAddress(dll_handle, "get_value_char"); // Don't use "get_value" version!!!
-		//	m_fn_ch_dir = (ChangeDirFn)GetProcAddress(dll_handle, "chang_dir");
-		//	m_fn_read_bin_data = (ReadBinaryDataFn)GetProcAddress(dll_handle, "read_bin_file");
-		//	m_fn_ex_auth = (ExternalAuthFn)GetProcAddress(dll_handle, "External_Authentication");
-		//	m_fn_install_key = (InstallKeyFn)GetProcAddress(dll_handle, "InstallKey");
-		//}
-		//else
-		//	throw std::exception(("Fail to load the DILI card device DLL from path : " + wstr_2_str(kDLLFile)).c_str());
 	}
 	std::string RWDevice::GetValue() const
@@ -18,9 +18,7 @@
 #include "./ExLib/mfc/dbghelp.h"
 #include "./ETradeClient/utility/win_msg_define.h"
-//for test
-#include "place_order_dlg.h"
-//
+
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -191,14 +189,6 @@ BOOL CETradeClientApp::InitInstance()
 	// such as the name of your company or organization
 	SetRegistryKey(APP_ID);
-	//for test
-	//PlaceOrderDlg dlg;
-	/*if (dlg.DoModal())
-	{
-	return FALSE;
-	}*/
-	//
-
 	// First, do login job.
 	if (!CLoginDialog(L"欢迎使用综合业务系统！").Launch())
 	{
@@ -23,6 +23,7 @@
     {"res_id":50150, 	"auth_id":5508, "icon":"cash_withdraw.ico", 			"index":[3, 1]},
     {"res_id":50160, 	"auth_id":5512, "icon":"fee_payment.ico", 				"index":[3, 2]},
     {"res_id":50170, 	"auth_id":5516, "icon":"settle_accounts_apply.ico", 	"index":[3, 3]},
+	{"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]},
@@ -30,6 +31,7 @@
 	{"res_id":5, 		"auth_id":70, 	"icon":"", 								"index":[5]},
 	{"res_id":50182, 	"auth_id":7002, "icon":"about.ico", 					"index":[5, 0]},
 	{"res_id":50183, 	"auth_id":7004, "icon":"about.ico", 					"index":[5, 1]},
+	{"res_id":50184, 	"auth_id":7005, "icon":"about.ico", 					"index":[5, 2]},
     {"res_id":6,        "auth_id":0,    "icon":"",                              "index":[6]},
     {"res_id":32807,    "auth_id":0,    "icon":"modify_cfg.ico",                "index":[6, 0]},
     {"res_id":32782,    "auth_id":0,    "icon":"exit.ico",                      "index":[]},
@@ -117,17 +117,19 @@ BEGIN
         MENUITEM "提现",                          ID_CASH_WITHDRAW
         MENUITEM "缴费",                          ID_FEE_PAYMENT
         MENUITEM "结账申请",                        ID_SETTLE_ACCOUNTS_APPLY
+        MENUITEM "账户转账",                        ID_ACCOUNT_TRANSFER
     END
     POPUP "查询业务(&C)"
     BEGIN
         MENUITEM "客户查询",                        ID_CUSTOMER_QUERY
-        MENUITEM "操作记录",                        ID_OPER_LOG_QUERY
+        MENUITEM "操作记录",                        ID_ACCOUNT_TRANSFER
         MENUITEM "客户管理",                        ID_CUS_MANAGE
     END
     POPUP "市场业务(&F)"
     BEGIN
         MENUITEM "ETC业务查询",                     ID_ETC_QUERY
         MENUITEM "ETC业务办理",                     ID_ETC_SERVICE
+        MENUITEM "王卡业务",                        ID_KING_CARD
     END
     POPUP "设置(&S)"
     BEGIN
@@ -243,8 +245,8 @@ END
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,2
- PRODUCTVERSION 1,0,0,2
+ FILEVERSION 1,0,0,3
+ PRODUCTVERSION 1,0,0,3
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -261,12 +263,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "地利集团【DILI GROUP】"
             VALUE "FileDescription", "电子交易结算柜员系统【ETradeClient】"
-            VALUE "FileVersion", "1.0.0.2"
+            VALUE "FileVersion", "1.0.0.3"
             VALUE "InternalName", "ETradeClient.exe"
             VALUE "LegalCopyright", "(C) 地利集团。  保留所有权利。"
             VALUE "OriginalFilename", "ETradeClient.exe"
             VALUE "ProductName", "电子交易结算柜员系统"
-            VALUE "ProductVersion", "1.0.1.180808_Beta"
+            VALUE "ProductVersion", "1.0.1.181015_Release"
         END
     END
     BLOCK "VarFileInfo"
@@ -417,23 +417,6 @@ namespace DILICard
 	//------Private Implementations----------------
 	void RWDevice::Init()
 	{
-		//const std::wstring kDLLFile = L"./dyn.dll";
-		//HINSTANCE dll_handle = LoadLibrary(kDLLFile.c_str());
-		//if (NULL != dll_handle)
-		//{
-		//	m_fn_open = (OpenFn)GetProcAddress(dll_handle, "open");
-		//	m_fn_beep = (BeepFn)GetProcAddress(dll_handle, "beep");
-		//	m_fn_close = (CloseFn)GetProcAddress(dll_handle, "close");
-		//	m_fn_find_card = (FindCardFn)GetProcAddress(dll_handle, "findCard");
-		//	m_fn_write_bin_data = (WriteBinaryDataFn)GetProcAddress(dll_handle, "write_bin_file");
-		//	m_fn_get_value = (GetValueFn)GetProcAddress(dll_handle, "get_value_char"); // Don't use "get_value" version!!!
-		//	m_fn_ch_dir = (ChangeDirFn)GetProcAddress(dll_handle, "chang_dir");
-		//	m_fn_read_bin_data = (ReadBinaryDataFn)GetProcAddress(dll_handle, "read_bin_file");
-		//	m_fn_ex_auth = (ExternalAuthFn)GetProcAddress(dll_handle, "External_Authentication");
-		//	m_fn_install_key = (InstallKeyFn)GetProcAddress(dll_handle, "InstallKey");
-		//}
-		//else
-		//	throw std::exception(("Fail to load the DILI card device DLL from path : " + wstr_2_str(kDLLFile)).c_str());
 	}
 	std::string RWDevice::GetValue() const
@@ -1182,3 +1182,75 @@ ReadPINPadCmd::Reply ReadBankCardNumCmd::Execute(const std::string&amp; input)
 	reply.data.put("chipNo", bank_card_no);
 	return reply;
 }
+
+ReadPINPadCmd::Reply ReadDILIAndBankCardNumCmd::Execute(const std::string& input)
+{
+	LOG_TRACE(L"读取园区卡或银行卡。");
+	Reply reply;
+	auto& dili_card_device = DILICardRWDevice();
+	DILICard::BasicInfo card_basic_info;
+	std::string sCardNum;
+	do
+	{
+		try
+		{
+			dili_card_device.Connect();
+		}
+		catch (std::exception& ex)
+		{
+			LOG_FATAL(L"连接读卡器失败，错误信息： " + str_2_wstr(ex.what()));
+			reply.error_code = StatusCode::CPU_CARD_DEVICE_CONNECT_FAILED;
+			break;
+		}
+		try
+		{
+			dili_card_device.FindCard();
+		}
+		catch (std::exception& ex)
+		{
+			LOG_FATAL(L"寻卡失败，错误信息： " + str_2_wstr(ex.what()));
+			reply.error_code = StatusCode::CPU_CARD_DEVICE_CANNOT_FIND_CARD;
+			break;
+		}
+
+		try
+		{
+			card_basic_info = dili_card_device.ReadCardBasicInfo();
+			sCardNum = card_basic_info.chip_num;
+		}
+		catch (std::exception& ex)
+		{
+			LOG_FATAL(L"读取园区卡卡片基本信息失败，错误信息： " + str_2_wstr(ex.what()));
+			try
+			{
+				LOG_TRACE(L"读取银行卡号。");
+				auto& bank_card_reader = BankCardReader_();
+				if (!bank_card_reader.Connect())
+				{
+					LOG_ERROR(L"连接银行卡读卡器失败。");
+					reply.error_code = StatusCode::CPU_CARD_DEVICE_CONNECT_FAILED;
+					break;
+				}
+				sCardNum = bank_card_reader.ReadBankCardNum();
+			}
+			catch (std::exception& ex)
+			{
+				LOG_FATAL(L"读取银行卡号失败，错误信息： " + str_2_wstr(ex.what()));
+				reply.error_code = StatusCode::BANK_CARD_READ_CARD_NUM_FAILED;
+				break;
+			}
+
+		}
+	} while (0);
+	dili_card_device.Disconnect();
+	if (boost::iequals(reply.error_code, StatusCode::OK))
+		LOG_TRACE(L"读取卡片基本信息成功。");
+
+	reply.data.put("chipNo", sCardNum);
+	reply.data.put("deviceId", card_basic_info.device_id);
+	reply.data.put("type", card_basic_info.type_code);
+	reply.data.put("issuerCode", card_basic_info.issuer_code);
+	reply.data.put("verifyCode", card_basic_info.verify_code);
+
+	return reply;
+}
 \ No newline at end of file
@@ -86,4 +86,12 @@ class ReadBankCardNumCmd : public HardwareCmd
 public:
 	virtual Reply Execute(const std::string& input) override;
 };
+
+//中央结算特殊需求，一个接口先刷园区卡再刷银行卡
+class ReadDILIAndBankCardNumCmd : public HardwareCmd
+{
+public:
+	virtual Reply Execute(const std::string& input) override;
+};
+//
 #endif // ETRADECLIENT_HARDWARE_HARDWARE_CMD_H_INCLUDED
@@ -58,11 +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_CUS_MANAGE                   50181
-#define ID_OPER_LOG_QUERY               50190
 #define ID_ETC_QUERY                    50182
 #define ID_ETC_SERVICE                  50183
+#define ID_KING_CARD                    50184
+#define ID_OPER_LOG_QUERY               50190
 #define ID_INDICATOR_TIME               59142
 // Next default values for new objects
@@ -70,7 +72,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        326
-#define _APS_NEXT_COMMAND_VALUE         32835
+#define _APS_NEXT_COMMAND_VALUE         32840
 #define _APS_NEXT_CONTROL_VALUE         1018
 #define _APS_NEXT_SYMED_VALUE           311
 #endif