|
|
@@ -2,6 +2,7 @@ package com.izouma.nineth.web;
|
|
|
|
|
|
import com.github.binarywang.wxpay.exception.WxPayException;
|
|
|
import com.izouma.nineth.domain.Order;
|
|
|
+import com.izouma.nineth.domain.User;
|
|
|
import com.izouma.nineth.dto.OrderDTO;
|
|
|
import com.izouma.nineth.dto.PageQuery;
|
|
|
import com.izouma.nineth.enums.CollectionType;
|
|
|
@@ -9,6 +10,7 @@ import com.izouma.nineth.enums.OrderStatus;
|
|
|
import com.izouma.nineth.enums.PayMethod;
|
|
|
import com.izouma.nineth.exception.BusinessException;
|
|
|
import com.izouma.nineth.repo.OrderRepo;
|
|
|
+import com.izouma.nineth.repo.UserRepo;
|
|
|
import com.izouma.nineth.service.OrderService;
|
|
|
import com.izouma.nineth.utils.ObjUtils;
|
|
|
import com.izouma.nineth.utils.SecurityUtils;
|
|
|
@@ -22,8 +24,10 @@ import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.io.IOException;
|
|
|
+import java.time.OffsetTime;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
import java.util.Optional;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -33,6 +37,7 @@ import java.util.stream.Collectors;
|
|
|
public class OrderController extends BaseController {
|
|
|
private OrderService orderService;
|
|
|
private OrderRepo orderRepo;
|
|
|
+ private UserRepo userRepo;
|
|
|
|
|
|
//@PreAuthorize("hasRole('ADMIN')")
|
|
|
@PostMapping("/save")
|
|
|
@@ -52,6 +57,19 @@ public class OrderController extends BaseController {
|
|
|
return orderService.all(pageQuery);
|
|
|
}
|
|
|
|
|
|
+ @PostMapping("/backAll")
|
|
|
+ public Page<Order> backAll(@RequestBody PageQuery pageQuery) {
|
|
|
+ Page<Order> all = orderService.all(pageQuery);
|
|
|
+ List<Long> userIds = all.getContent().stream().map(Order::getUserId).distinct().collect(Collectors.toList());
|
|
|
+ Map<Long, String> userMap = userRepo.findAllById(userIds)
|
|
|
+ .stream()
|
|
|
+ .collect(Collectors.toMap(User::getId, User::getNickname));
|
|
|
+ return all.map(order -> {
|
|
|
+ order.setNickname(userMap.get(order.getUserId()));
|
|
|
+ return order;
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
@GetMapping("/get/{id}")
|
|
|
public Order get(@PathVariable Long id) {
|
|
|
return orderRepo.findById(id).orElseThrow(new BusinessException("无记录"));
|