Commit 4ec97333 authored by hezhen's avatar hezhen

修改员工业绩

parent fde81042
...@@ -258,7 +258,7 @@ public class StaffStatisticsBiz { ...@@ -258,7 +258,7 @@ public class StaffStatisticsBiz {
if (CollectionUtils.isNotEmpty(appUserSellingWaterDTOS)) { if (CollectionUtils.isNotEmpty(appUserSellingWaterDTOS)) {
//3.根据订单id查询订单相关信息 //3.根据订单id查询订单相关信息
List<Integer> orderIds = appUserSellingWaterDTOS.stream().map(AppUserSellingWaterDTO::getOrderId).collect(Collectors.toList()); List<Integer> orderIds = appUserSellingWaterDTOS.stream().map(AppUserSellingWaterDTO::getOrderId).collect(Collectors.toList());
ObjectRestResponse<List<OrderDTO>> response = orderFeign.findOrdersByorderId(orderIds); ObjectRestResponse<List<OrderDTO>> response = orderFeign.findOrdersByorderIdV2(orderIds);
List<OrderDTO> orders = response.getData(); List<OrderDTO> orders = response.getData();
Map<Integer, Integer> ordersMap = orders.stream().collect(Collectors.toMap(OrderDTO::getId, OrderDTO::getCompanyId)); Map<Integer, Integer> ordersMap = orders.stream().collect(Collectors.toMap(OrderDTO::getId, OrderDTO::getCompanyId));
for (AppUserSellingWaterDTO appUserSellingWaterDTO : appUserSellingWaterDTOS) { for (AppUserSellingWaterDTO appUserSellingWaterDTO : appUserSellingWaterDTOS) {
......
...@@ -6,10 +6,7 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse; ...@@ -6,10 +6,7 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.xxfc.platform.order.pojo.dto.OrderDTO; import com.xxfc.platform.order.pojo.dto.OrderDTO;
import com.xxfc.platform.order.pojo.order.OrderPageVO; import com.xxfc.platform.order.pojo.order.OrderPageVO;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List; import java.util.List;
...@@ -27,4 +24,7 @@ public interface OrderFeign { ...@@ -27,4 +24,7 @@ public interface OrderFeign {
@GetMapping(value = "/count/basebase/findByOrderIds") @GetMapping(value = "/count/basebase/findByOrderIds")
public ObjectRestResponse<List<OrderDTO>> findOrdersByorderId(@RequestParam(value = "orderIds") List<Integer> orderIds); public ObjectRestResponse<List<OrderDTO>> findOrdersByorderId(@RequestParam(value = "orderIds") List<Integer> orderIds);
@PostMapping(value = "/count/basebase/findOrdersByorderIdV2")
ObjectRestResponse<List<OrderDTO>> findOrdersByorderIdV2(@RequestBody List<Integer> orderIds);
} }
...@@ -33,4 +33,11 @@ public class OrderListController { ...@@ -33,4 +33,11 @@ public class OrderListController {
public ObjectRestResponse<List<OrderDTO>> findOrdersByorderId(@RequestParam(value = "orderIds") List<Integer> orderIds){ public ObjectRestResponse<List<OrderDTO>> findOrdersByorderId(@RequestParam(value = "orderIds") List<Integer> orderIds){
return ObjectRestResponse.succ(baseOrderBiz.selectBaeOrderByOrderIds(orderIds)); return ObjectRestResponse.succ(baseOrderBiz.selectBaeOrderByOrderIds(orderIds));
} }
@PostMapping(value = "/basebase/findOrdersByorderIdV2")
@IgnoreClientToken
@IgnoreUserToken
public ObjectRestResponse<List<OrderDTO>> findOrdersByorderIdV2(@RequestBody List<Integer> orderIds){
return ObjectRestResponse.succ(baseOrderBiz.selectBaeOrderByOrderIds(orderIds));
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment