Commit 12f004b1 authored by huangcb's avatar huangcb

承运商接口:查询司机详情(通过帐号)

parent 1368af06
...@@ -191,6 +191,9 @@ public class ErrorMessageComponent { ...@@ -191,6 +191,9 @@ public class ErrorMessageComponent {
@Value("${error-message.carrier.driver.detail.1001}") @Value("${error-message.carrier.driver.detail.1001}")
private String carrierDriverDetail1001; private String carrierDriverDetail1001;
@Value("${error-message.carrier.driver.detail-by-account.1001}")
private String carrierDriverDetailByAccount1001;
@Value("${error-message.carrier.driver.audit.1001}") @Value("${error-message.carrier.driver.audit.1001}")
private String carrierDriverAudit1001; private String carrierDriverAudit1001;
@Value("${error-message.carrier.driver.audit.1002}") @Value("${error-message.carrier.driver.audit.1002}")
......
...@@ -147,11 +147,11 @@ public class DriverController { ...@@ -147,11 +147,11 @@ public class DriverController {
* author Administrator * author Administrator
* createTime 2020/04/28 20:26 * createTime 2020/04/28 20:26
**/ **/
@PostMapping("/detailByAccount") @PostMapping("/getDetailByAccount")
public EResponse detailByAccount(@RequestBody @Validated(ValidatorDetailAccount.class) DriverQueryForm form) throws EException { public EResponse getDetailByAccount(@RequestBody @Validated(ValidatorDetailAccount.class) DriverQueryForm form) throws EException {
DriverDetailDto dto = driverAccountService.getDriverDetailByAccount(form.getAccount()); DriverDetailDto dto = driverAccountService.getDriverDetailByAccount(form.getAccount());
if (null == dto) { if (null == dto) {
throw new EException(1001, errorMessageComponent.getCarrierDriverDetail1001()); throw new EException(1001, errorMessageComponent.getCarrierDriverDetailByAccount1001());
} }
// 数据转换 // 数据转换
......
...@@ -158,6 +158,8 @@ error-message: ...@@ -158,6 +158,8 @@ error-message:
1004: 从业资格证号已存在 1004: 从业资格证号已存在
detail: detail:
1001: 无效的账号ID 1001: 无效的账号ID
detail-by-account:
1001: 无效的账号
audit: audit:
1001: 无效的账号ID 1001: 无效的账号ID
1002: 帐号已审核通过 1002: 帐号已审核通过
......
...@@ -643,4 +643,57 @@ public class DriverAccountTest extends BaseTestController { ...@@ -643,4 +643,57 @@ public class DriverAccountTest extends BaseTestController {
JSONObject result = JSONObject.parseObject(responseStr); JSONObject result = JSONObject.parseObject(responseStr);
Assert.assertEquals(1002, result.getIntValue("code")); Assert.assertEquals(1002, result.getIntValue("code"));
} }
/**
* 查询司机详情-通过帐号
**/
@Test
public void h1_getDetailByAccount_success_test() throws Exception {
String url = "/carrier/driver/getDetailByAccount";
// 构造数据
DriverQueryForm form = new DriverQueryForm();
form.setAccount("18512340001");
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders())
.content(form.toString()))
.andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk())
.andReturn();
String responseStr = mvcResult.getResponse().getContentAsString();
log.info(responseStr);
JSONObject result = JSONObject.parseObject(responseStr);
Assert.assertEquals(ECode.SUCCESS.code(), result.getIntValue("code"));
Assert.assertTrue(result.getJSONObject("data").containsKey("id"));
}
/**
* 查询司机详情-通过帐号:无效的账号
**/
@Test
public void h2_getDetailByAccount_wrong_account_failure_test() throws Exception {
String url = "/carrier/driver/getDetailByAccount";
// 构造数据
DriverQueryForm form = new DriverQueryForm();
form.setAccount("18912340001");
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders())
.content(form.toString()))
.andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk())
.andReturn();
String responseStr = mvcResult.getResponse().getContentAsString();
log.info(responseStr);
JSONObject result = JSONObject.parseObject(responseStr);
Assert.assertEquals(1001, result.getIntValue("code"));
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment