Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
customer-service
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
SuperHive
back-end
customer-service
Commits
12f004b1
Commit
12f004b1
authored
Apr 30, 2020
by
huangcb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
承运商接口:查询司机详情(通过帐号)
parent
1368af06
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
61 additions
and
3 deletions
+61
-3
ErrorMessageComponent.java
...ight/customer/common/component/ErrorMessageComponent.java
+3
-0
DriverController.java
...t/customer/module/driver/controller/DriverController.java
+3
-3
application-dev.yml
src/main/resources/application-dev.yml
+2
-0
DriverAccountTest.java
.../customer/module/driver/controller/DriverAccountTest.java
+53
-0
No files found.
src/main/java/com/esv/freight/customer/common/component/ErrorMessageComponent.java
View file @
12f004b1
...
@@ -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}"
)
...
...
src/main/java/com/esv/freight/customer/module/driver/controller/DriverController.java
View file @
12f004b1
...
@@ -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
(
"/
d
etailByAccount"
)
@PostMapping
(
"/
getD
etailByAccount"
)
public
EResponse
d
etailByAccount
(
@RequestBody
@Validated
(
ValidatorDetailAccount
.
class
)
DriverQueryForm
form
)
throws
EException
{
public
EResponse
getD
etailByAccount
(
@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
.
getCarrierDriverDetail
ByAccount
1001
());
}
}
// 数据转换
// 数据转换
...
...
src/main/resources/application-dev.yml
View file @
12f004b1
...
@@ -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
:
帐号已审核通过
...
...
src/test/java/com/esv/freight/customer/module/driver/controller/DriverAccountTest.java
View file @
12f004b1
...
@@ -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"
));
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment