Merge remote-tracking branch 'origin/qa' into qa

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

@@ -702,6 +702,9 @@ public class CheckMCCafeOrder {
         //校验收货地址是否可配送
         String receiveId = createOrderVo.getReceiveId();
         String trackingNo = LogThreadLocal.getTrackingNo();
+        if(StringUtils.isBlank(receiveId)) {
+            throw new ServiceException(ResponseResult.ORDER_TAKE_OUT_ADDRESS_INVAILD, "收货地址不能为空");
+        }
         QueryReceiveAddressRequest request = new QueryReceiveAddressRequest(receiveId, storeDeliveryInfoDto.getPartnerId());
         BaseResponse<QueryReceiveAddressResponse> queryReceiveAddressResponse = memberCenterService.queryReceiveAddressById(request, trackingNo);
         if (!ResponseResult.SUCCESS.getCode().equals(queryReceiveAddressResponse.getCode()) || queryReceiveAddressResponse.getData() == null) {