Merge branch 'feature/xukang_20210907_麦咖啡订单数据推送到麦当劳' into qa

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

@@ -2564,7 +2564,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                         pushMccafeOrder.setStoreId(orderInfoReqs.getStoreId());
                         if(!"SUCCESS".equals(responseDto.getCode())) {
                             pushMccafeOrder.setStatus(0);
-                            pushMccafeOrder.setFailReason(responseDto.getMessage());
+                            pushMccafeOrder.setFailReason(JSON.toJSONString(responseDto));
                         } else {
                             pushMccafeOrder.setStatus(1);
                         }
@@ -2845,7 +2845,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                         QueryReceiveAddressRequest request = new QueryReceiveAddressRequest(JSON.parseObject(deliveryContactInfoResp.getExtInfo()).getString("receiveId"), mcCafePartnerId);
                         com.freemud.application.sdk.api.base.BaseResponse<QueryReceiveAddressResponse> queryReceiveAddressResponse = memberCenterService.queryReceiveAddressById(request, LogThreadLocal.getTrackingNo());
                         if (!ResponseResult.SUCCESS.getCode().equals(queryReceiveAddressResponse.getCode()) || queryReceiveAddressResponse.getData() == null) {
-                            throw new ServiceException(ResponseResult.USER_GETRECEIVEADDRESS_ERROR);
+                            throw new ServiceException(ResponseResult.USER_GETRECEIVEADDRESS_ERROR, "查询收货地址异常");
                         }
                         orderAddress.setGender(queryReceiveAddressResponse.getData().getSex().toString());
                         orderAddress.setPhone_no(queryReceiveAddressResponse.getData().getReceiveMobile());