修复问题

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

@@ -2369,21 +2369,31 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         if (endDate == null) {
             return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode(), "查询订单结束时间格式不正确");
         }
-        String userId = userLoginInfoDto.getMemberId();
-        queryOrderVo.setStartDate(startDateStr);
-        queryOrderVo.setEndDate(endDateStr);
-        queryOrderVo.setPageNumber(1);
-        queryOrderVo.setPageSize(1);
-        QueryOrderVo vo =new QueryOrderVo();
-        BeanUtils.copyProperties(queryOrderVo,vo);
-        String channelType = this.getQueryOrderChannelType(vo, userLoginInfoDto);
-        QueryOrdersDto queryOrdersDto = orderAdapter.convent2QueryOrdersDtoMcCafe(queryOrderVo, userId, channelType);
+        QueryOrdersRequest queryOrdersRequest = new QueryOrdersRequest();
+        queryOrdersRequest.setUserId(userLoginInfoDto.getMemberId());
+        queryOrdersRequest.setCompanyId(queryOrderVo.getPartnerId());
+        queryOrdersRequest.setPageSize(1);
+        queryOrdersRequest.setPageNumber(1);
+        queryOrdersRequest.setStartDate(startDateStr);
+        queryOrdersRequest.setEndDate(endDateStr);
+
+        queryOrdersRequest.setSource(new String[]{OrderChannelType.SAAS.getCode()});
+
+        queryOrdersRequest.setPayStatus(new Integer[]{PayStatus.HAVE_PAID.getCode(), PayStatus.HAVE_REFUND.getCode(), PayStatus.COMPLETE.getCode()});
+
+        queryOrdersRequest.setStatus(new Integer[]{OrderStatus.COMPLETE.getCode()});
+
+        queryOrdersRequest.setType(new Integer[]{OrderType.COLLECT_GOODS.getCode(), OrderType.EAT_IN.getCode(), OrderType.TAKE_OUT.getCode()});
+
+        //商品订单和卖券订单
+        queryOrdersRequest.setBizTypes(Arrays.asList(1,6));
+
+        queryOrdersRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
+
+
         QueryOrdersResponse queryOrderResponse = null;
         try {
-            QueryOrdersRequest queryOrdersRequest2 = new QueryOrdersRequest();
-            BeanUtil.convertBean(queryOrdersDto, queryOrdersRequest2);
-            queryOrdersRequest2.setTrackingNo(LogTreadLocal.getTrackingNo());
-            queryOrderResponse = orderCenterSdkService.queryMCCafeOrders(queryOrdersRequest2);
+            queryOrderResponse = orderCenterSdkService.queryMCCafeOrders(queryOrdersRequest);
         } catch (Exception e) {
             log.error("queryRecentOrders_error : " + ExceptionUtils.getExceptionInfo(e));
             return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode(), "查询订单异常");