java/qijisheng.git

			@@ -235,7 +235,12 @@

			@PostMapping("/byUserId")
			public R<List<Order>> byUserId(@RequestParam("appUserId") Long appUserId,@RequestParam("shopId") Integer shopId){
			return R.ok(orderService.lambdaQuery().eq(Order::getAppUserId, appUserId).eq(Order::getShopId, shopId).list());
			List<Order> list = orderService.lambdaQuery()
			.eq(Order::getAppUserId, appUserId)
			.eq(Order::getShopId, shopId)
			.eq(Order::getDistributionMode, 1)
			.ne(Order::getOrderStatus,5).list();
			return R.ok(list);
			}
			@PostMapping("/byShopId")
			public R<List<Order>> byShopId(@RequestParam("shopId") Integer shopId){
			@@ -243,7 +248,10 @@
			}
			@PostMapping("/byShopIdAndUserId")
			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();
			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);
			}