java/qijisheng.git

			@@ -242,7 +242,7 @@
			return R.ok(orderService.lambdaQuery().isNotNull(Order::getEndTime).eq(Order::getShopId, shopId).list());
			}
			@PostMapping("/byShopIdAndUserId")
			public R<List<Order>> byShopIdAndUserId(@RequestParam("shopId") Integer shopId,@RequestParam("appUserId") Long appUserId){
			public R<List<Order>> byShopIdAndUserId(@RequestParam("appUserId") Long appUserId,@RequestParam("shopId") Integer shopId){
			List<Order> list = orderService.lambdaQuery().isNotNull(Order::getEndTime).eq(Order::getShopId, shopId).eq(Order::getAppUserId, appUserId).in(Order::getOrderStatus, 4, 7, 8).list();
			return R.ok(list);
			}
			@@ -360,7 +360,7 @@
			} catch (ParseException e) {
			throw new RuntimeException(e);
			}
			}).reversed())
			}))
			.collect(Collectors.toList());
			orderStatistics.setOrderStatisticsDetailList(sortedDetails);
			}