Merge remote-tracking branch 'origin/feature-2020/8/6-McCafe-会阳' into feature-2020/8/6-McCafe-会阳

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -2826,7 +2826,10 @@ public class OrderServiceImpl implements Orderservice {
             dto.setDeliveryId(orderBean.getAddInfo().getDeliveryId());
         }
         QueryDeliveryAmountResponseDto responseDto = deliveryFeiginClient.orderRemind(dto);
-        if(responseDto == null || RESPONSE_SUCCESS_CODE != responseDto.getCode() ) {
+        if(null != response && 120 == responseDto.getCode()) {
+            return ResponseUtil.error("120", response.getErrmsg());
+        }
+        if(responseDto == null || RESPONSE_SUCCESS_CODE != responseDto.getCode()) {
             return ResponseUtil.error(ResponseResult.DELIVERY_REMINDER_ERROR);
         }
         return ResponseUtil.success();