Merge branch 'hotfix/20200522_同意退款取消配送单fixbug' into develop

order-management/src/main/java/cn/freemud/management/service/handle/DeliveryHandle.java

@@ -114,7 +114,7 @@ public class DeliveryHandle {
             //商家退款取消配送
             cancelDeliveryOrderRequestDto.setOrderCancelDescription("顾客取消订单");
             DeliveryResponseDto deliveryResponse = deliveryService.deliveryOrderCancel(cancelDeliveryOrderRequestDto, LogThreadLocal.getTrackingNo());
-            if (deliveryResponse == null || ObjectUtils.notEqual(Integer.getInteger(ResponseResult.SUCCESS.getCode()), deliveryResponse.getCode())) {
+            if (deliveryResponse == null || !StringUtils.equals(ResponseResult.SUCCESS.getCode(), deliveryResponse.getCode()+"")) {
                 throw new DeliveryServiceException(ResponseResult.DELIVERY_CANCEL_ORDER_ERROR, deliveryResponse.getMsg());
             }
         }