Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
a461a559
Commit
a461a559
authored
Aug 11, 2020
by
huiyang.chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加骑手距离字段
parent
3f596db3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
order-application-service/src/main/java/cn/freemud/entities/dto/delivery/ResRiderTrackDto.java
+8
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+3
-3
No files found.
order-application-service/src/main/java/cn/freemud/entities/dto/delivery/ResRiderTrackDto.java
View file @
a461a559
...
@@ -37,4 +37,12 @@ public class ResRiderTrackDto {
...
@@ -37,4 +37,12 @@ public class ResRiderTrackDto {
* 门店所在位置经度(高德地图坐标)
* 门店所在位置经度(高德地图坐标)
*/
*/
private
String
storeLng
;
private
String
storeLng
;
/**
* 骑手与收货人的直线距离
*/
private
Double
receiverDistance
;
/**
* 骑手与门店的直线距离
*/
private
Double
storeDistance
;
}
}
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
a461a559
...
@@ -2781,7 +2781,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -2781,7 +2781,7 @@ public class OrderServiceImpl implements Orderservice {
if
(
userLoginInfoDto
==
null
||
StringUtils
.
isBlank
(
userLoginInfoDto
.
getMemberId
()))
{
if
(
userLoginInfoDto
==
null
||
StringUtils
.
isBlank
(
userLoginInfoDto
.
getMemberId
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
NOT_LOGIN
);
return
ResponseUtil
.
error
(
ResponseResult
.
NOT_LOGIN
);
}
}
BaseQueryOrderRequest
baseQueryOrderRequest
=
new
BaseQueryOrderRequest
();
/*
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(vo.getOid());
baseQueryOrderRequest.setOrderId(vo.getOid());
baseQueryOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
baseQueryOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
...
@@ -2792,7 +2792,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -2792,7 +2792,7 @@ public class OrderServiceImpl implements Orderservice {
//判断订单状态
//判断订单状态
if (!cn.freemud.management.enums.OrderStatus.DISTRIBUTION.getCode().equals(orderBean.getStatus())) {
if (!cn.freemud.management.enums.OrderStatus.DISTRIBUTION.getCode().equals(orderBean.getStatus())) {
return ResponseUtil.error(ResponseResult.DELIVERY_QUERY_RIDER_STATUS_ERROR);
return ResponseUtil.error(ResponseResult.DELIVERY_QUERY_RIDER_STATUS_ERROR);
}
}
*/
QueryLocusRiderTrackDto
dto
=
new
QueryLocusRiderTrackDto
();
QueryLocusRiderTrackDto
dto
=
new
QueryLocusRiderTrackDto
();
dto
.
setDeliveryChannel
(
"CanDao"
);
dto
.
setDeliveryChannel
(
"CanDao"
);
dto
.
setOrderId
(
vo
.
getOid
());
dto
.
setOrderId
(
vo
.
getOid
());
...
@@ -2800,7 +2800,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -2800,7 +2800,7 @@ public class OrderServiceImpl implements Orderservice {
if
(
responses
==
null
||
RESPONSE_SUCCESS_CODE
!=
Integer
.
valueOf
(
responses
.
getCode
())
||
responses
.
getResult
()
==
null
)
{
if
(
responses
==
null
||
RESPONSE_SUCCESS_CODE
!=
Integer
.
valueOf
(
responses
.
getCode
())
||
responses
.
getResult
()
==
null
)
{
return
ResponseUtil
.
error
(
ResponseResult
.
DELIVERY_QUERY_RIDER_ERROR
);
return
ResponseUtil
.
error
(
ResponseResult
.
DELIVERY_QUERY_RIDER_ERROR
);
}
}
return
ResponseUtil
.
success
();
return
ResponseUtil
.
success
(
responses
.
getResult
()
);
}
}
}
}
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