异常回调

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

@@ -48,7 +48,7 @@ public class DeliveryController {
     @ApiOperation(value = "配送异常回调", notes = "配送异常回调", produces = "application/json")
     @PostMapping("/delivery/errorCallbackUrl")
     public BaseResponse errorCallbackUrl(@Valid @LogParams @RequestBody CallbackUrlRequestDto request) {
-        return deliveryService.callbackUrl(request);
+        return deliveryService.errorCallbackUrl(request);
     }
 
     @ApiAnnotation(logMessage = "麦咖啡配送回调")

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

@@ -334,34 +334,13 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         int deliveryStatus = request.getDeliveryStatus();
         String partnerId = request.getPartnerId();
         String storeCode = request.getStoreId();
-
-        PosBaseRequestDto posBaseRequestDto = new PosBaseRequestDto();
-        posBaseRequestDto.setOrder_id(request.getOrderId());
-        posBaseRequestDto.setPartner_id(partnerId);
-
         Integer sendPosDeliveryStatus;
-        if (request.getDeliveryStatus() == DeliveryStatus.DELIVERYERROR.getCode()) {
+        if (deliveryStatus == DeliveryStatus.DELIVERYERROR.getCode()) {
             sendPosDeliveryStatus = 71;
         } else {
             sendPosDeliveryStatus = 81;
         }
         sendPosMessage(partnerId, storeCode, request.getOrderId(), sendPosDeliveryStatus, request.getRemark());
-        //推送异常到生态
-        sendException(request.getOrderId(), request.getExceptionDesc(), request.getUpdateTime(), DeliveryStatus.getDeliveryStatusByCode(deliveryStatus).getDesc());
-
-        // 运单异常，取消订单
-        posBaseRequestDto.setReason("没有骑手接单");
-        posBaseRequestDto.setDeliveryId(request.getDeliveryId());
-        sendPosService(deliveryStatus, posBaseRequestDto);
-
-        // 订单配送状态变化时发送到MQ
-        if (DeliveryStatus.checkDeliveryStatueForPlatform(deliveryStatus)) {
-            produceMQService.sendOfDeliveryInfo(request);
-            produceMQService.sendRocketMqOfDeliveryInfo(request);
-        }
-        //配送订阅消息
-        sendMicroMessage(partnerId, request.getOrderId(), deliveryStatus);
-
         return ResponseUtil.success();
     }