Merge branch 'feature/20200309_1.9.1415_TAPD1007005'

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

@@ -30,13 +30,14 @@ import com.freemud.sdk.api.assortment.order.request.order.AssortmentUpdateDelive
 import com.freemud.sdk.api.assortment.order.request.order.UpdateDeliveryInfoByIdRequest;
 import com.freemud.sdk.api.assortment.order.response.order.OrderBaseResponse;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
-import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Map;
+import java.util.List;
 
 /**
  * All rights Reserved, Designed By www.freemud.cn
@@ -112,8 +113,12 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
             // 订单已完成
             sendPosService(deliveryStatus,posBaseRequestDto);
         } else if (deliveryStatus == DeliveryStatus.DELIVERYERROR.getCode() || deliveryStatus == DeliveryStatus.DELIVERYCANCEL.getCode()) {
+
             // 取消外卖中台配送单 订单异常
-            partnerCancelOrder(request.getDeliveryId());
+            // 如果 "配送单异常并且顾客更改配送地址" 不取消配送单
+            if (!isDeliveryAbnormalAndCustomerChangedAddress(request)) {
+                partnerCancelOrder(request.getDeliveryId());
+            }
             // 运单异常，取消订单
             posBaseRequestDto.setReason("没有骑手接单");
             posBaseRequestDto.setDeliveryId(request.getDeliveryId());
@@ -132,6 +137,25 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         return ResponseUtil.success();
     }
 
+    /**
+     * 配送单异常并且顾客更改配送地址
+     *
+     * @return
+     */
+    public boolean isDeliveryAbnormalAndCustomerChangedAddress(CallbackUrlRequestDto request) {
+        if (DeliveryStatus.DELIVERYERROR.getCode() != request.getDeliveryStatus()) return false;
+        if (StringUtils.isBlank(request.getRemark())) return false;
+
+        List<String> abnormalDesc = Lists.newArrayList("顾客更改配送地址", "顾客更改收货地址");
+        for (String str : abnormalDesc) {
+            if (request.getRemark().contains(str)) {
+                log.info("isDeliveryAbnormalAndCustomerChangedAddress.true of {}", JSONObject.toJSONString(request));
+                return true;
+            }
+        }
+        return false;
+    }
+
     @Override
     public BaseResponse mallCallbackUrl(CallbackUrlRequestDto request) {
         return ResponseUtil.success();