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
95bd6d24
Commit
95bd6d24
authored
Sep 02, 2020
by
huiyang.chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix 骑手位置
parent
afe85a36
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
23 deletions
+1
-23
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+1
-23
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
95bd6d24
...
@@ -2843,34 +2843,12 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -2843,34 +2843,12 @@ 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.setOrderId(vo.getOid());
baseQueryOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
if (!RESPONSE_SUCCESS_CODE.equals(response.getErrcode()) || response.getData() == null) {
return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);
}
QueryOrdersResponse.DataBean.OrderBean orderBean = response.getData();
//判断订单状态
if (!cn.freemud.management.enums.OrderStatus.DISTRIBUTION.getCode().equals(orderBean.getStatus())) {
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
());
BaseResponse
<
ResRiderTrackDto
>
responses
=
deliveryFeiginClient
.
listFreeRider
(
dto
);
BaseResponse
<
ResRiderTrackDto
>
responses
=
deliveryFeiginClient
.
listFreeRider
(
dto
);
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
)
{
ResRiderTrackDto
trackDto
=
new
ResRiderTrackDto
();
return
ResponseUtil
.
error
(
ResponseResult
.
DELIVERY_QUERY_RIDER_ERROR
);
trackDto
.
setReceiverDistance
(
1832.0
);
trackDto
.
setReceiverLat
(
"23.401341"
);
trackDto
.
setReceiverLng
(
"116.733883"
);
trackDto
.
setRiderLat
(
"23.385071"
);
trackDto
.
setRiderLng
(
"116.731188"
);
trackDto
.
setStoreDistance
(
3.0
);
trackDto
.
setStoreLat
(
"23.385068"
);
trackDto
.
setStoreLng
(
"116.731158"
);
return
ResponseUtil
.
success
(
trackDto
);
//return ResponseUtil.error(ResponseResult.DELIVERY_QUERY_RIDER_ERROR);
}
}
return
ResponseUtil
.
success
(
responses
.
getResult
());
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