Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
app-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
app-service
Commits
78f56a42
Commit
78f56a42
authored
May 11, 2020
by
zhangzc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
0b5adbee
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
4 deletions
+6
-4
CheckCustomToken.java
...a/com/esv/freight/app/common/filter/CheckCustomToken.java
+1
-0
GrabController.java
...reight/app/module/grabbing/controller/GrabController.java
+4
-2
OrderGrabbingQueryForm.java
...ight/app/module/grabbing/form/OrderGrabbingQueryForm.java
+0
-1
OwnerWaybillController.java
...app/module/waybill/controller/OwnerWaybillController.java
+1
-1
No files found.
src/main/java/com/esv/freight/app/common/filter/CheckCustomToken.java
View file @
78f56a42
...
@@ -56,6 +56,7 @@ public class CheckCustomToken {
...
@@ -56,6 +56,7 @@ public class CheckCustomToken {
"/app/driverBackend/account/login/loginByPwd"
.
equals
(
url
)
||
"/app/driverBackend/account/login/loginByPwd"
.
equals
(
url
)
||
"/app/driverBackend/account/carrier/list"
.
equals
(
url
)
||
"/app/driverBackend/account/carrier/list"
.
equals
(
url
)
||
"/app/driverBackend/account/login/check/phone"
.
equals
(
url
)
||
"/app/driverBackend/account/login/check/phone"
.
equals
(
url
)
||
"/app/driverBackend/grab/find/list"
.
equals
(
url
)
||
"/app/driverBackend/password/reset"
.
equals
(
url
))
{
"/app/driverBackend/password/reset"
.
equals
(
url
))
{
//此类接口不校验token
//此类接口不校验token
...
...
src/main/java/com/esv/freight/app/module/grabbing/controller/GrabController.java
View file @
78f56a42
...
@@ -58,11 +58,13 @@ public class GrabController {
...
@@ -58,11 +58,13 @@ public class GrabController {
@PostMapping
(
"/find/list"
)
@PostMapping
(
"/find/list"
)
public
EResponse
getFindGoodsList
(
@RequestBody
(
required
=
false
)
@Validated
(
ValidatorList
.
class
)
OrderGrabbingQueryForm
orderGrabbingQueryForm
)
{
public
EResponse
getFindGoodsList
(
@RequestBody
(
required
=
false
)
@Validated
(
ValidatorList
.
class
)
OrderGrabbingQueryForm
orderGrabbingQueryForm
)
{
appLoginService
.
checkAccessToken
();
//
appLoginService.checkAccessToken();
// 调用查询抢单信息列表接口
// 调用查询抢单信息列表接口
JSONObject
reqJson
=
new
JSONObject
();
JSONObject
reqJson
=
new
JSONObject
();
if
(
orderGrabbingQueryForm
.
getDriverId
()
!=
null
)
{
reqJson
.
put
(
"driverId"
,
orderGrabbingQueryForm
.
getDriverId
());
reqJson
.
put
(
"driverId"
,
orderGrabbingQueryForm
.
getDriverId
());
}
if
(!
StringUtils
.
isNullOrEmpty
(
orderGrabbingQueryForm
.
getDeliveryProvinceCode
()))
{
if
(!
StringUtils
.
isNullOrEmpty
(
orderGrabbingQueryForm
.
getDeliveryProvinceCode
()))
{
reqJson
.
put
(
"deliveryProvinceCode"
,
orderGrabbingQueryForm
.
getDeliveryProvinceCode
());
reqJson
.
put
(
"deliveryProvinceCode"
,
orderGrabbingQueryForm
.
getDeliveryProvinceCode
());
...
...
src/main/java/com/esv/freight/app/module/grabbing/form/OrderGrabbingQueryForm.java
View file @
78f56a42
...
@@ -27,7 +27,6 @@ public class OrderGrabbingQueryForm {
...
@@ -27,7 +27,6 @@ public class OrderGrabbingQueryForm {
/**
/**
* 司机ID
* 司机ID
*/
*/
@NotNull
(
message
=
"参数司机ID不能为空"
,
groups
=
{
ValidatorList
.
class
})
private
Long
driverId
;
private
Long
driverId
;
/**
/**
...
...
src/main/java/com/esv/freight/app/module/waybill/controller/OwnerWaybillController.java
View file @
78f56a42
...
@@ -150,7 +150,7 @@ public class OwnerWaybillController {
...
@@ -150,7 +150,7 @@ public class OwnerWaybillController {
// 调用上传发货单据接口
// 调用上传发货单据接口
JSONObject
reqJson
=
new
JSONObject
();
JSONObject
reqJson
=
new
JSONObject
();
reqJson
.
put
(
"
waybillI
d"
,
waybillQueryForm
.
getWaybillId
());
reqJson
.
put
(
"
i
d"
,
waybillQueryForm
.
getWaybillId
());
log
.
info
(
reqJson
.
toJSONString
());
log
.
info
(
reqJson
.
toJSONString
());
JSONObject
result
=
tmsWaybillInterface
.
sign
(
reqJson
);
JSONObject
result
=
tmsWaybillInterface
.
sign
(
reqJson
);
log
.
info
(
result
.
toJSONString
());
log
.
info
(
result
.
toJSONString
());
...
...
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