Commit 6d918b5975c28058fe47c09bc8ec1d8d74d7e5bd
1 parent
6ed3258a
feat<card>:卡务客户端取消同时读取园区卡银行卡接口
底层读卡模块有改动，卡务暂时不用同时读取园区卡银行卡。
Showing
6 changed files
with
4 additions
and
74 deletions
central_clearing_system/ETradeClient/browser/async_js_callback_handler.cpp
| ... | ... | @@ -42,6 +42,8 @@ namespace HW |
| 42 | 42 | static const std::string JSON_VAL_ANS_READ_FAILED = "read_failed"; |
| 43 | 43 | static const std::string JSON_VAL_ANS_WRITE_ACK = "write_ack"; |
| 44 | 44 | static const std::string JSON_VAL_ANS_WRITE_FAILED = "write_failed"; |
| 45 | + static const std::string JSON_VAL_ANS_PRINT_ACK = "print_ack"; | |
| 46 | + static const std::string JSON_VAL_ANS_PRINT_FAILED = "print_failed"; | |
| 45 | 47 | |
| 46 | 48 | static const std::string JSON_VAL_FILEID_DILI_CARD = "00"; |
| 47 | 49 | static const std::string JSON_VAL_FILEID_DILI_CARD_BASIC_INFO = "01"; | ... | ... |
central_clearing_system/ETradeClient/hardware/hardware_cmd.cpp
| ... | ... | @@ -53,7 +53,7 @@ namespace StatusCode |
| 53 | 53 | |
| 54 | 54 | static const std::string BANK_CARD_READ_CARD_NUM_FAILED = "501"; // 读取银行卡卡号失败. |
| 55 | 55 | |
| 56 | - static const std::string PRINT_PARSE_DATA_FAILED = "601"; //解析打印数据失败 | |
| 56 | + static const std::string PRINT_PARSE_DATA_FAILED = "1001"; //解析打印数据失败 | |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | namespace EncryptTools | ... | ... |
central_clearing_system/out/Win32/Debug.zip renamed to central_clearing_system/out/Win32/综合业务系统.zip
No preview for this file type
etrade_card_client/Config/url_cfg.json
etrade_card_client/ETradeClient/hardware/hardware_cmd.cpp
| ... | ... | @@ -1182,75 +1182,3 @@ ReadPINPadCmd::Reply ReadBankCardNumCmd::Execute(const std::string& input) |
| 1182 | 1182 | reply.data.put("chipNo", bank_card_no); |
| 1183 | 1183 | return reply; |
| 1184 | 1184 | } |
| 1185 | - | |
| 1186 | -ReadPINPadCmd::Reply ReadDILIAndBankCardNumCmd::Execute(const std::string& input) | |
| 1187 | -{ | |
| 1188 | - LOG_TRACE(L"读取园区卡或银行卡。"); | |
| 1189 | - Reply reply; | |
| 1190 | - auto& dili_card_device = DILICardRWDevice(); | |
| 1191 | - DILICard::BasicInfo card_basic_info; | |
| 1192 | - std::string sCardNum; | |
| 1193 | - do | |
| 1194 | - { | |
| 1195 | - try | |
| 1196 | - { | |
| 1197 | - dili_card_device.Connect(); | |
| 1198 | - } | |
| 1199 | - catch (std::exception& ex) | |
| 1200 | - { | |
| 1201 | - LOG_FATAL(L"连接读卡器失败，错误信息： " + str_2_wstr(ex.what())); | |
| 1202 | - reply.error_code = StatusCode::CPU_CARD_DEVICE_CONNECT_FAILED; | |
| 1203 | - break; | |
| 1204 | - } | |
| 1205 | - try | |
| 1206 | - { | |
| 1207 | - dili_card_device.FindCard(); | |
| 1208 | - } | |
| 1209 | - catch (std::exception& ex) | |
| 1210 | - { | |
| 1211 | - LOG_FATAL(L"寻卡失败，错误信息： " + str_2_wstr(ex.what())); | |
| 1212 | - reply.error_code = StatusCode::CPU_CARD_DEVICE_CANNOT_FIND_CARD; | |
| 1213 | - break; | |
| 1214 | - } | |
| 1215 | - | |
| 1216 | - try | |
| 1217 | - { | |
| 1218 | - card_basic_info = dili_card_device.ReadCardBasicInfo(); | |
| 1219 | - sCardNum = card_basic_info.chip_num; | |
| 1220 | - } | |
| 1221 | - catch (std::exception& ex) | |
| 1222 | - { | |
| 1223 | - LOG_FATAL(L"读取园区卡卡片基本信息失败，错误信息： " + str_2_wstr(ex.what())); | |
| 1224 | - try | |
| 1225 | - { | |
| 1226 | - LOG_TRACE(L"读取银行卡号。"); | |
| 1227 | - auto& bank_card_reader = BankCardReader_(); | |
| 1228 | - if (!bank_card_reader.Connect()) | |
| 1229 | - { | |
| 1230 | - LOG_ERROR(L"连接银行卡读卡器失败。"); | |
| 1231 | - reply.error_code = StatusCode::CPU_CARD_DEVICE_CONNECT_FAILED; | |
| 1232 | - break; | |
| 1233 | - } | |
| 1234 | - sCardNum = bank_card_reader.ReadBankCardNum(); | |
| 1235 | - } | |
| 1236 | - catch (std::exception& ex) | |
| 1237 | - { | |
| 1238 | - LOG_FATAL(L"读取银行卡号失败，错误信息： " + str_2_wstr(ex.what())); | |
| 1239 | - reply.error_code = StatusCode::BANK_CARD_READ_CARD_NUM_FAILED; | |
| 1240 | - break; | |
| 1241 | - } | |
| 1242 | - | |
| 1243 | - } | |
| 1244 | - } while (0); | |
| 1245 | - dili_card_device.Disconnect(); | |
| 1246 | - if (boost::iequals(reply.error_code, StatusCode::OK)) | |
| 1247 | - LOG_TRACE(L"读取卡片基本信息成功。"); | |
| 1248 | - | |
| 1249 | - reply.data.put("chipNo", sCardNum); | |
| 1250 | - reply.data.put("deviceId", card_basic_info.device_id); | |
| 1251 | - reply.data.put("type", card_basic_info.type_code); | |
| 1252 | - reply.data.put("issuerCode", card_basic_info.issuer_code); | |
| 1253 | - reply.data.put("verifyCode", card_basic_info.verify_code); | |
| 1254 | - | |
| 1255 | - return reply; | |
| 1256 | -} | |
| 1257 | 1185 | \ No newline at end of file | ... | ... |
etrade_card_client/out/Win32/卡务客户端.zip
0 → 100644
No preview for this file type