jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
wangyingyang
12a7d7e9 1 parent 8064aca6

fix

Inline Side-by-side
Showing 5 changed files with 20 additions and 12 deletions
No preview for this file type
...@@ -37,10 +37,10 @@ public class MealController { ...@@ -37,10 +37,10 @@ public class MealController {
37 } 37 }
38 38
39 @ApiOperation(value = "获取enterprise所有餐别") 39 @ApiOperation(value = "获取enterprise所有餐别")
40 - @GetMapping("/enterprises/{enterpriseId}/meals") 40 + @GetMapping("/enterprises/meals")
41 @ResponseStatus(HttpStatus.OK) 41 @ResponseStatus(HttpStatus.OK)
42 - public List<MealDto> getAllMeals(@PathVariable Integer enterpriseId) { 42 + public List<MealDto> getAllMeals() {
43 - return mealService.getAllMeals(enterpriseId); 43 + return mealService.getAllMeals();
44 } 44 }
45 45
46 } 46 }
......
...@@ -7,5 +7,5 @@ public interface MealService { ...@@ -7,5 +7,5 @@ public interface MealService {
7 7
8 List<MealDto> getMealsByIds(Integer enterpriseId, List<Integer> ids); 8 List<MealDto> getMealsByIds(Integer enterpriseId, List<Integer> ids);
9 9
10 - List<MealDto> getAllMeals(Integer enterpriseId); 10 + List<MealDto> getAllMeals();
11 } 11 }
......
...@@ -134,15 +134,20 @@ public class KdsServiceImpl implements KdsService { ...@@ -134,15 +134,20 @@ public class KdsServiceImpl implements KdsService {
134 134
135 final var operatorLoginInfo = LoginContextHolder.getLoginInfo(); 135 final var operatorLoginInfo = LoginContextHolder.getLoginInfo();
136 136
137 - final var userResource = enterpriseResourceServiceRpcClient.getUserResources( 137 + boolean shouldFilterStallIds = false;
138 - operatorLoginInfo.getEnterpriseId(), operatorLoginInfo.getId()); 138 + List<Integer> stallIds = new ArrayList<>();
139 + final var operator = wOperatorServiceRpcClient.getWOperatorById(operatorLoginInfo.getId()).getResponse();
140 + if (!operator.getIsSuper()) {
141 + shouldFilterStallIds = true;
142 + final var userResource = enterpriseResourceServiceRpcClient.getUserResources(
143 + operatorLoginInfo.getEnterpriseId(), operatorLoginInfo.getId());
144 + stallIds.addAll(userResource.getStallIdsList());
145 + }
139 146
140 final var queryOrderDto = QueryOrderByConditionDto.builder() 147 final var queryOrderDto = QueryOrderByConditionDto.builder()
141 .enterpriseId(operatorLoginInfo.getEnterpriseId()) 148 .enterpriseId(operatorLoginInfo.getEnterpriseId())
142 - .shouldFilterClientIds(true) 149 + .shouldFilterStallIds(shouldFilterStallIds)
143 - .clientIds(userResource.getClientIdsList()) 150 + .stallIds(stallIds)
144 - .shouldFilterStallIds(true)
145 - .stallIds(userResource.getStallIdsList())
146 .shouldFilterCreatedAtTimeStart(true) 151 .shouldFilterCreatedAtTimeStart(true)
147 .createdAtTimeStart(todayZero) 152 .createdAtTimeStart(todayZero)
148 .shouldFilterCreatedAtTimeEnd(true) 153 .shouldFilterCreatedAtTimeEnd(true)
...@@ -150,6 +155,7 @@ public class KdsServiceImpl implements KdsService { ...@@ -150,6 +155,7 @@ public class KdsServiceImpl implements KdsService {
150 .shouldFilterStatus(true) 155 .shouldFilterStatus(true)
151 .status(queryDto.getOrderStatus()) 156 .status(queryDto.getOrderStatus())
152 .build(); 157 .build();
158 +
153 final var orderList = orderServiceRpcClient.getOrdersByCondition(queryOrderDto); 159 final var orderList = orderServiceRpcClient.getOrdersByCondition(queryOrderDto);
154 List<Integer> orderIds = orderList.stream() 160 List<Integer> orderIds = orderList.stream()
155 .map(SingleClientCustomerOrderRpcResponse::getId) 161 .map(SingleClientCustomerOrderRpcResponse::getId)
......
1 package com.infoloop.tianting.service.impl; 1 package com.infoloop.tianting.service.impl;
2 2
3 +import com.infoloop.tianting.context.LoginContextHolder;
3 import com.infoloop.tianting.model.dto.MealDbDTO.MealDto; 4 import com.infoloop.tianting.model.dto.MealDbDTO.MealDto;
4 import com.infoloop.tianting.service.MealService; 5 import com.infoloop.tianting.service.MealService;
5 import com.infoloop.tianting.service.client.MealServiceRpcClient; 6 import com.infoloop.tianting.service.client.MealServiceRpcClient;
...@@ -40,8 +41,9 @@ public class MealServiceImpl implements MealService { ...@@ -40,8 +41,9 @@ public class MealServiceImpl implements MealService {
40 } 41 }
41 42
42 @Override 43 @Override
43 - public List<MealDto> getAllMeals(Integer enterpriseId) { 44 + public List<MealDto> getAllMeals() {
44 - final var response = mealServiceRpcClient.getAllMeals(enterpriseId); 45 + final var operatorLoginInfo = LoginContextHolder.getLoginInfo();
46 + final var response = mealServiceRpcClient.getAllMeals(operatorLoginInfo.getEnterpriseId());
45 return response.getResponsesList().stream().map( 47 return response.getResponsesList().stream().map(
46 meal -> MealDto.builder() 48 meal -> MealDto.builder()
47 .id(meal.getId()) 49 .id(meal.getId())
......