Commit 001ab8c3 by ping.wu

Merge branches 'feature/20211117_去除使用Pair代码_wuping' and 'qa' of…

Merge branches 'feature/20211117_去除使用Pair代码_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
parents 017dd63a 28851079
...@@ -1116,7 +1116,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -1116,7 +1116,7 @@ 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()){ if(Objects.equals(NewOrderStatus.ACCEPTED.getIndex(), cancelOrderRequest.getStatusV2())){
StoreResponse.Configuration configuration = getStoreAutoConfiguration(cancelOrderRequest.getPartnerId(), cancelOrderRequest.getStoreId(), cancelOrderRequest.getTrackingNo()); StoreResponse.Configuration configuration = getStoreAutoConfiguration(cancelOrderRequest.getPartnerId(), cancelOrderRequest.getStoreId(), cancelOrderRequest.getTrackingNo());
if (configuration != null) { if (configuration != null) {
if(StringUtils.isNotEmpty(configuration.getAutoSelfmentionMakerWorkflowFinishTime())){ if(StringUtils.isNotEmpty(configuration.getAutoSelfmentionMakerWorkflowFinishTime())){
......
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