Commit 11f83b56 by 王世昌

提交版本

parent fe2405e9
...@@ -96,8 +96,8 @@ public class UpdateDeliveryInfoByIdRequest extends BaseConfig { ...@@ -96,8 +96,8 @@ public class UpdateDeliveryInfoByIdRequest extends BaseConfig {
public Long estimateArriveTime; public Long estimateArriveTime;
/** /**
* 商家承担的配送费(单位:分) * 商家承担的配送费(单位:分 )
*/ */
public BigDecimal businessDeliveryAmount; public BigDecimal businessDeliveryAmount ;
} }
...@@ -1109,7 +1109,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -1109,7 +1109,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
expressReq.setExceptionId(request.getExceptionId()); expressReq.setExceptionId(request.getExceptionId());
expressReq.setOpType(request.getOpType()); expressReq.setOpType(request.getOpType());
// 【ID1032317】外卖配送完成回调订单基础服务接口添加商户承担运费字段 // 【ID1032317】外卖配送完成回调订单基础服务接口添加商户承担运费字段
expressReq.setBusinessDeliveryAmount(request.getBusinessDeliveryAmount()); expressReq.setBusinessDeliveryAmount(request.getBusinessDeliveryAmount() );
if(null !=request.getOrderClient() && OrderClientType.SAASMALL.getIndex() == request.getOrderClient() && 0 == request.getOpType()){ if(null !=request.getOrderClient() && OrderClientType.SAASMALL.getIndex() == request.getOrderClient() && 0 == request.getOpType()){
OrderTaskReq orderTask = new OrderTaskReq(); OrderTaskReq orderTask = new OrderTaskReq();
orderTask.setTaskType(5); orderTask.setTaskType(5);
......
...@@ -3,7 +3,7 @@ package cn.freemud.entities.dto.delivery; ...@@ -3,7 +3,7 @@ package cn.freemud.entities.dto.delivery;
import cn.freemud.base.util.DateUtil; import cn.freemud.base.util.DateUtil;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal ;
/** /**
* All rights Reserved, Designed By www.freemud.cn * All rights Reserved, Designed By www.freemud.cn
...@@ -94,8 +94,8 @@ public class CallbackUrlRequestDto { ...@@ -94,8 +94,8 @@ public class CallbackUrlRequestDto {
public Long estimateArriveTime; public Long estimateArriveTime;
/** /**
* 商家承担的配送费(单位:分) * 商家承担的配送费(单位:分 )
*/ */
public BigDecimal businessDeliveryAmount; public BigDecimal businessDeliveryAmount ;
} }
...@@ -138,7 +138,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -138,7 +138,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
//【ID1031049】 订单接受配送分配骑手状态回调 //【ID1031049】 订单接受配送分配骑手状态回调
requestDto.setEstimateArriveTime(request.getEstimateArriveTime()); requestDto.setEstimateArriveTime(request.getEstimateArriveTime());
// 【ID1032317】外卖配送完成回调订单基础服务接口添加商户承担运费字段 // 【ID1032317】外卖配送完成回调订单基础服务接口添加商户承担运费字段
requestDto.setBusinessDeliveryAmount(request.getBusinessDeliveryAmount()); requestDto.setBusinessDeliveryAmount(request.getBusinessDeliveryAmount() );
if (StringUtils.isNotBlank(request.getRemark())) { if (StringUtils.isNotBlank(request.getRemark())) {
requestDto.setRemark("配送:" + request.getRemark()); requestDto.setRemark("配送:" + request.getRemark());
} }
......
...@@ -91,9 +91,9 @@ public class OrderExpressReq { ...@@ -91,9 +91,9 @@ public class OrderExpressReq {
public Long estimateArriveTime; public Long estimateArriveTime;
/** /**
* 商家承担的配送费(单位:分) * 商家承担的配送费(单位:分 )
*/ */
public BigDecimal businessDeliveryAmount; public BigDecimal businessDeliveryAmount ;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment