Merge branches 'feature/20210720-购物车日志修改-张志恒' and 'master' of…

Merge branches 'feature/20210720-购物车日志修改-张志恒' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

order-management/src/main/java/cn/freemud/management/service/impl/WaimaiOrderMangerServiceImpl.java

@@ -49,7 +49,7 @@ public class WaimaiOrderMangerServiceImpl implements OrderManagerService {
         PlatformOrderRequest platformOrderRequest = waimaiSdkAdapter.getPlatformOrderRequest(request, orderBean);
         com.freemud.application.sdk.api.base.BaseResponse waimaiBaseResponse = waimaiOrderService.confirm(platformOrderRequest, LogThreadLocal.getTrackingNo());
         if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), waimaiBaseResponse.getCode())) {
-            ErrorLog.errorConvertJson(this.getClass(),ResponseResult.ORDER_ACCEPT_FAILED.getMessage() + " ordercode: "+ request.getOrderId(),null);
+//            ErrorLog.errorConvertJson(this.getClass(),ResponseResult.ORDER_ACCEPT_FAILED.getMessage() + " ordercode: "+ request.getOrderId(),null);
             throw new OrderServiceException(ResponseResult.ORDER_ACCEPT_FAILED);
         }
         return ResponseUtil.success();