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
7a71fc29
Commit
7a71fc29
authored
Jul 12, 2024
by
fm01154
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
外卖订单出餐后,更新pickUpTime字段
parent
56e53c9c
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
43 additions
and
0 deletions
+43
-0
order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java
+13
-0
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java
+6
-0
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/TakeOutOrderPickUpTimeReq.java
+12
-0
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java
+12
-0
No files found.
order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java
View file @
7a71fc29
...
@@ -9,12 +9,15 @@ import cn.freemud.management.enums.ResponseResult;
...
@@ -9,12 +9,15 @@ import cn.freemud.management.enums.ResponseResult;
import
cn.freemud.management.service.OrderBaseService
;
import
cn.freemud.management.service.OrderBaseService
;
import
cn.freemud.management.service.handle.OrderVerifyHandle
;
import
cn.freemud.management.service.handle.OrderVerifyHandle
;
import
cn.freemud.management.util.ResponseUtil
;
import
cn.freemud.management.util.ResponseUtil
;
import
com.freemud.application.sdk.api.log.LogThreadLocal
;
import
com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1
;
import
com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1
;
import
com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum
;
import
com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum
;
import
com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus
;
import
com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus
;
import
com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1
;
import
com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1
;
import
com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderTypeV1
;
import
com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderTypeV1
;
import
com.freemud.application.sdk.api.ordercenter.enums.orderv1.RefundStatusV1
;
import
com.freemud.application.sdk.api.ordercenter.enums.orderv1.RefundStatusV1
;
import
com.freemud.application.sdk.api.ordercenter.request.TakeOutOrderPickUpTimeReq
;
import
com.freemud.application.sdk.api.ordercenter.service.OrderSdkService
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.lang.ObjectUtils
;
import
org.apache.commons.lang.ObjectUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
...
@@ -32,6 +35,8 @@ public class OrderManagerAdapter {
...
@@ -32,6 +35,8 @@ public class OrderManagerAdapter {
@Autowired
@Autowired
private
OrderBaseService
orderBaseService
;
private
OrderBaseService
orderBaseService
;
@Autowired
@Autowired
private
OrderSdkService
orderSdkService
;
@Autowired
private
OrderBeanFactory
orderBeanFactory
;
private
OrderBeanFactory
orderBeanFactory
;
@Value
(
"${mccafe.partner.id}"
)
@Value
(
"${mccafe.partner.id}"
)
private
String
macCafePartnerId
;
private
String
macCafePartnerId
;
...
@@ -80,6 +85,14 @@ public class OrderManagerAdapter {
...
@@ -80,6 +85,14 @@ public class OrderManagerAdapter {
return
handleResponse
(
request
,
orderBean
,
verifyResponse
);
return
handleResponse
(
request
,
orderBean
,
verifyResponse
);
}
}
BaseResponse
<
OrderManagerResponse
>
orderManagerResponse
=
orderBeanFactory
.
getOrderManagerService
(
orderBean
).
orderDone
(
request
,
orderBean
);
BaseResponse
<
OrderManagerResponse
>
orderManagerResponse
=
orderBeanFactory
.
getOrderManagerService
(
orderBean
).
orderDone
(
request
,
orderBean
);
//更新外卖订单的pickUpTime
if
(
ObjectUtils
.
equals
(
ResponseResult
.
SUCCESS
.
getCode
(),
orderManagerResponse
.
getCode
()))
{
String
trackingNo
=
LogThreadLocal
.
getTrackingNo
();
TakeOutOrderPickUpTimeReq
takeOutOrderPickUpTimeReq
=
new
TakeOutOrderPickUpTimeReq
();
takeOutOrderPickUpTimeReq
.
setOrderCode
(
request
.
getOrderId
());
orderSdkService
.
updateTakeOutOrderPickUpTime
(
takeOutOrderPickUpTimeReq
,
trackingNo
);
}
return
handleResponse
(
request
,
orderBean
,
orderManagerResponse
);
return
handleResponse
(
request
,
orderBean
,
orderManagerResponse
);
}
}
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java
View file @
7a71fc29
...
@@ -106,6 +106,12 @@ public class InterfaceAddressConstant {
...
@@ -106,6 +106,12 @@ public class InterfaceAddressConstant {
* 通用订单状态修改
* 通用订单状态修改
*/
*/
public
static
final
String
UPDATE_ORDER_STATE
=
"order/v2/updateOrderState"
;
public
static
final
String
UPDATE_ORDER_STATE
=
"order/v2/updateOrderState"
;
/**
* 外卖订单pickUpTime更新
*/
public
static
final
String
UPDATE_TAKEOUT_ORDER_PICK_UP_TIME
=
"order/v2/updateTakeOutOrderPickUpTime"
;
/**
/**
* 批量 查询订单明细
* 批量 查询订单明细
*/
*/
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/TakeOutOrderPickUpTimeReq.java
0 → 100644
View file @
7a71fc29
package
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
request
;
import
lombok.Data
;
@Data
public
class
TakeOutOrderPickUpTimeReq
{
/**
* 订单号
*/
private
String
orderCode
;
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java
View file @
7a71fc29
...
@@ -379,6 +379,18 @@ public class OrderSdkService {
...
@@ -379,6 +379,18 @@ public class OrderSdkService {
}
}
/**
/**
* 修改外卖订单的pickUpTime
* @param request
* @return
*/
public
OrderBaseResp
updateTakeOutOrderPickUpTime
(
TakeOutOrderPickUpTimeReq
request
,
String
trackingNo
){
OrderBaseResp
responseDTO
=
RequestThirdPartyUtils
.
httpJsonReqComplexNew
(
restTemplate
,
InterfaceAddressConstant
.
UPDATE_TAKEOUT_ORDER_PICK_UP_TIME
,
createBaseRequest
(
request
,
trackingNo
),
new
ParameterizedTypeReference
<
OrderBaseResp
>()
{
});
return
responseHandle
(
responseDTO
);
}
/**
* 已配送完成
* 已配送完成
*/
*/
public
OrderBaseResp
prepareCompleteDelivery
(
POSOrderOperationBaseReq
request
,
String
trackingNo
)
{
public
OrderBaseResp
prepareCompleteDelivery
(
POSOrderOperationBaseReq
request
,
String
trackingNo
)
{
...
...
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