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
11f83b56
Commit
11f83b56
authored
Jul 05, 2021
by
王世昌
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交版本
parent
fe2405e9
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
9 deletions
+9
-9
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/UpdateDeliveryInfoByIdRequest.java
+2
-2
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
+1
-1
order-application-service/src/main/java/cn/freemud/entities/dto/delivery/CallbackUrlRequestDto.java
+3
-3
order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
+1
-1
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExpressReq.java
+2
-2
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/UpdateDeliveryInfoByIdRequest.java
View file @
11f83b56
...
...
@@ -96,8 +96,8 @@ public class UpdateDeliveryInfoByIdRequest extends BaseConfig {
public
Long
estimateArriveTime
;
/**
* 商家承担的配送费(单位:分)
* 商家承担的配送费(单位:分
)
*/
public
BigDecimal
businessDeliveryAmount
;
public
BigDecimal
businessDeliveryAmount
;
}
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
View file @
11f83b56
...
...
@@ -1109,7 +1109,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
expressReq
.
setExceptionId
(
request
.
getExceptionId
());
expressReq
.
setOpType
(
request
.
getOpType
());
// 【ID1032317】外卖配送完成回调订单基础服务接口添加商户承担运费字段
expressReq
.
setBusinessDeliveryAmount
(
request
.
getBusinessDeliveryAmount
());
expressReq
.
setBusinessDeliveryAmount
(
request
.
getBusinessDeliveryAmount
()
);
if
(
null
!=
request
.
getOrderClient
()
&&
OrderClientType
.
SAASMALL
.
getIndex
()
==
request
.
getOrderClient
()
&&
0
==
request
.
getOpType
()){
OrderTaskReq
orderTask
=
new
OrderTaskReq
();
orderTask
.
setTaskType
(
5
);
...
...
order-application-service/src/main/java/cn/freemud/entities/dto/delivery/CallbackUrlRequestDto.java
View file @
11f83b56
...
...
@@ -3,7 +3,7 @@ package cn.freemud.entities.dto.delivery;
import
cn.freemud.base.util.DateUtil
;
import
lombok.Data
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
/**
* All rights Reserved, Designed By www.freemud.cn
...
...
@@ -94,8 +94,8 @@ public class CallbackUrlRequestDto {
public
Long
estimateArriveTime
;
/**
* 商家承担的配送费(单位:分)
* 商家承担的配送费(单位:分
)
*/
public
BigDecimal
businessDeliveryAmount
;
public
BigDecimal
businessDeliveryAmount
;
}
order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
View file @
11f83b56
...
...
@@ -138,7 +138,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
//【ID1031049】 订单接受配送分配骑手状态回调
requestDto
.
setEstimateArriveTime
(
request
.
getEstimateArriveTime
());
// 【ID1032317】外卖配送完成回调订单基础服务接口添加商户承担运费字段
requestDto
.
setBusinessDeliveryAmount
(
request
.
getBusinessDeliveryAmount
());
requestDto
.
setBusinessDeliveryAmount
(
request
.
getBusinessDeliveryAmount
()
);
if
(
StringUtils
.
isNotBlank
(
request
.
getRemark
()))
{
requestDto
.
setRemark
(
"配送:"
+
request
.
getRemark
());
}
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExpressReq.java
View file @
11f83b56
...
...
@@ -91,9 +91,9 @@ public class OrderExpressReq {
public
Long
estimateArriveTime
;
/**
* 商家承担的配送费(单位:分)
* 商家承担的配送费(单位:分
)
*/
public
BigDecimal
businessDeliveryAmount
;
public
BigDecimal
businessDeliveryAmount
;
}
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