Commit 9bc44c33 by ping.wu

接单拒绝退款会自动扭转到下一个订单状态,超时完成时间需要聚合层传到基础服务

parent e8ea4eae
...@@ -138,10 +138,14 @@ public class OrderSdkAdapter { ...@@ -138,10 +138,14 @@ public class OrderSdkAdapter {
var1.setReason(reason); var1.setReason(reason);
var1.setOrderClient(Integer.parseInt(orderBean.getOrderClient())); var1.setOrderClient(Integer.parseInt(orderBean.getOrderClient()));
var1.setPartnerId(orderBean.getCompanyId()); var1.setPartnerId(orderBean.getCompanyId());
if (orderBean.getGmtExpect() != null && orderBean.getGmtExpect() != 0) {
var1.setExpectTime(cn.freemud.base.util.DateUtil.convert2String(new Date(orderBean.getGmtExpect()), cn.freemud.base.util.DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
}
if (orderBean.getRefundList() != null && orderBean.getRefundList().size() != 0) { if (orderBean.getRefundList() != null && orderBean.getRefundList().size() != 0) {
//新订单服务需要售后单code //新订单服务需要售后单code
var1.setAfterSalesCode(orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getRid()); var1.setAfterSalesCode(orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getRid());
} }
var1.setStatusV2(orderBean.getStatusV2());
var1.setOperator(operator); var1.setOperator(operator);
return var1; return var1;
} }
......
...@@ -73,6 +73,11 @@ public class CancelOrderRequest extends BaseConfig { ...@@ -73,6 +73,11 @@ public class CancelOrderRequest extends BaseConfig {
@Builder.Default @Builder.Default
private boolean isRefundDeliveryAmount = true; private boolean isRefundDeliveryAmount = true;
//用户预约时间,仅为预约单时存放
private String expectTime;
private Integer statusV2;
/** /**
* 售后单拓展信息 * 售后单拓展信息
*/ */
......
...@@ -1088,6 +1088,19 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -1088,6 +1088,19 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request.setAfterSalesCode(cancelOrderRequest.getAfterSalesCode()); request.setAfterSalesCode(cancelOrderRequest.getAfterSalesCode());
request.setAdultRemark(cancelOrderRequest.getReason()); request.setAdultRemark(cancelOrderRequest.getReason());
request.setOperator(cancelOrderRequest.getOperator()); request.setOperator(cancelOrderRequest.getOperator());
if(NewOrderStatus.ACCEPTED.getIndex() == cancelOrderRequest.getStatusV2()){
StoreResponse.Configuration configuration = getStoreAutoConfiguration(cancelOrderRequest.getPartnerId(), cancelOrderRequest.getStoreId(), cancelOrderRequest.getTrackingNo());
if (configuration != null) {
if(StringUtils.isNotEmpty(configuration.getAutoSelfmentionMakerWorkflowFinishTime())){
request.setTimeout(AutoOrderConfigTime.getTime(configuration.getAutoSelfmentionMakerWorkflowFinishTime()));
}
if(StringUtils.isNotEmpty(cancelOrderRequest.getExpectTime()) && StringUtils.isNotEmpty(configuration.getAppointAutoSelfmentionMakerWorkflowFinishTime())){
request.setTimeout(AutoOrderConfigTime.getTime(configuration.getAppointAutoSelfmentionMakerWorkflowFinishTime()));
}
} else {
request.setTimeout(120);
}
}
com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.adultReject(request, cancelOrderRequest.getTrackingNo()); com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.adultReject(request, cancelOrderRequest.getTrackingNo());
return orderSdkAdapter.convent2BaseOrderResponse(response); return orderSdkAdapter.convent2BaseOrderResponse(response);
} }
......
...@@ -38,6 +38,11 @@ public class AfterSalesOperateReq { ...@@ -38,6 +38,11 @@ public class AfterSalesOperateReq {
//同意审核原因 //同意审核原因
private String adultRemark; private String adultRemark;
/**
* 拒绝退款后订单下个状态到下下个状态自动扭转时间(超时完成时间)
*/
private Integer timeout;
//操作人 //操作人
private String operator; private String operator;
} }
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