Commit 78f56a42 authored by zhangzc's avatar zhangzc

修改bug

parent 0b5adbee
...@@ -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
......
...@@ -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());
......
...@@ -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;
/** /**
......
...@@ -150,7 +150,7 @@ public class OwnerWaybillController { ...@@ -150,7 +150,7 @@ public class OwnerWaybillController {
// 调用上传发货单据接口 // 调用上传发货单据接口
JSONObject reqJson = new JSONObject(); JSONObject reqJson = new JSONObject();
reqJson.put("waybillId", waybillQueryForm.getWaybillId()); reqJson.put("id", 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());
......
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