添加骑手距离字段

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

@@ -860,12 +860,27 @@ public class OrderServiceImpl implements Orderservice {
         BeanUtils.copyProperties(queryOrderVo,vo);
         String channelType = this.getQueryOrderChannelType(vo, userLoginInfoDto);
         QueryOrdersDto queryOrdersDto = orderAdapter.convent2QueryOrdersDtoMcCafe(queryOrderVo, userId, channelType);
+
+        //封装查询正在进行中的订单数
+        McCafeQueryOrderVo queryOrderVoNow =new McCafeQueryOrderVo();
+        BeanUtils.copyProperties(queryOrderVo,queryOrderVoNow);
+        List<Integer> queryOrderStatus = Arrays.asList(QueryOrderStatus.TAKE_MEAL.getCode());
+        List<Integer> queryOrderType = Arrays.asList(OrderType.COLLECT_GOODS.getCode(),OrderType.TAKE_OUT.getCode());
+        queryOrderVoNow.setQueryOrderStatus(queryOrderStatus);
+        queryOrderVoNow.setQueryOrderType(queryOrderType);
+        QueryOrdersDto queryOrdersDtoNow = orderAdapter.convent2QueryOrdersDtoMcCafe(queryOrderVoNow, userId, channelType);
         QueryOrdersResponse queryOrderResponse;
+        QueryOrdersResponse queryOrderResponseNow;
         try {
             QueryOrdersRequest queryOrdersRequest2 = new QueryOrdersRequest();
             BeanUtil.convertBean(queryOrdersDto, queryOrdersRequest2);
             queryOrdersRequest2.setTrackingNo(LogTreadLocal.getTrackingNo());
             queryOrderResponse = orderCenterSdkService.queryOrders(queryOrdersRequest2);
+
+            QueryOrdersRequest queryOrdersRequestNow = new QueryOrdersRequest();
+            BeanUtil.convertBean(queryOrdersDtoNow, queryOrdersRequestNow);
+            queryOrdersRequestNow.setTrackingNo(LogTreadLocal.getTrackingNo());
+            queryOrderResponseNow = orderCenterSdkService.queryOrders(queryOrdersRequestNow);
         } catch (Exception e) {
             LogUtil.error("queryOrders_error", gson.toJson(queryOrdersDto), e);
             return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);
@@ -877,6 +892,7 @@ public class OrderServiceImpl implements Orderservice {
         //用户无订单数据
         if (queryOrderResponse.getData() == null || queryOrderResponse.getData().getCount() == 0) {
             responseMap.put("count", 0);
+            responseMap.put("progressOrderCount", queryOrderResponseNow.getData() == null ? 0 : queryOrderResponseNow.getData().getCount());
             responseMap.put("list", new ArrayList<QueryOrderResponseVo>());
             return ResponseUtil.success(responseMap);
         }
@@ -956,6 +972,7 @@ public class OrderServiceImpl implements Orderservice {
         List<QueryOrderResponseVo> queryOrderResponseVos = orderAdapter.convent2QueryOrderResponseVos(orders, userLoginInfoDto.getWxAppId(), userLoginInfoDto.getIappId());
 
         responseMap.put("count", queryOrderResponse.getData() == null ? 0 : queryOrderResponse.getData().getCount());
+        responseMap.put("progressOrderCount", queryOrderResponseNow.getData() == null ? 0 : queryOrderResponseNow.getData().getCount());
         responseMap.put("list", queryOrderResponseVos);
         //只有有订单时才显示用户自定义取餐信息
         if (CollectionUtils.isNotEmpty(queryOrderResponseVos)) {