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
76400c80
Commit
76400c80
authored
Sep 04, 2020
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix 骑手位置
parent
2e9d1a87
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
4 deletions
+19
-4
order-application-service/src/main/java/cn/freemud/entities/dto/MCCafeDeliveryBaseResponse.java
+13
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+3
-3
order-application-service/src/main/java/cn/freemud/service/thirdparty/DeliveryFeiginClient.java
+3
-1
No files found.
order-application-service/src/main/java/cn/freemud/entities/dto/MCCafeDeliveryBaseResponse.java
0 → 100644
View file @
76400c80
package
cn
.
freemud
.
entities
.
dto
;
import
lombok.Data
;
@Data
public
class
MCCafeDeliveryBaseResponse
<
T
>
{
private
String
code
;
private
String
msg
;
private
T
data
;
}
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
76400c80
...
...
@@ -2849,11 +2849,11 @@ public class OrderServiceImpl implements Orderservice {
QueryLocusRiderTrackDto
dto
=
new
QueryLocusRiderTrackDto
();
dto
.
setDeliveryChannel
(
"CanDao"
);
dto
.
setOrderId
(
vo
.
getOid
());
BaseResponse
<
ResRiderTrackDto
>
responses
=
deliveryFeiginClient
.
listFreeRider
(
dto
);
if
(
responses
==
null
||
RESPONSE_SUCCESS_CODE
!=
Integer
.
valueOf
(
responses
.
getCode
())
||
responses
.
get
Result
()
==
null
)
{
MCCafeDelivery
BaseResponse
<
ResRiderTrackDto
>
responses
=
deliveryFeiginClient
.
listFreeRider
(
dto
);
if
(
responses
==
null
||
RESPONSE_SUCCESS_CODE
!=
Integer
.
valueOf
(
responses
.
getCode
())
||
responses
.
get
Data
()
==
null
)
{
return
ResponseUtil
.
error
(
ResponseResult
.
DELIVERY_QUERY_RIDER_ERROR
);
}
return
ResponseUtil
.
success
(
responses
.
get
Result
());
return
ResponseUtil
.
success
(
responses
.
get
Data
());
}
}
order-application-service/src/main/java/cn/freemud/service/thirdparty/DeliveryFeiginClient.java
View file @
76400c80
package
cn
.
freemud
.
service
.
thirdparty
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.entities.dto.BaseResponseDto
;
import
cn.freemud.entities.dto.MCCafeDeliveryBaseResponse
;
import
cn.freemud.entities.dto.delivery.*
;
import
org.springframework.cloud.netflix.feign.FeignClient
;
import
org.springframework.web.bind.annotation.PostMapping
;
...
...
@@ -16,5 +18,5 @@ public interface DeliveryFeiginClient {
QueryDeliveryAmountResponseDto
orderRemind
(
@RequestBody
OrderRemindRequestDto
request
);
@PostMapping
(
"/delivery/listFreeRider"
)
BaseResponse
<
ResRiderTrackDto
>
listFreeRider
(
@RequestBody
QueryLocusRiderTrackDto
request
);
MCCafeDelivery
BaseResponse
<
ResRiderTrackDto
>
listFreeRider
(
@RequestBody
QueryLocusRiderTrackDto
request
);
}
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