|
@@ -203,11 +203,11 @@ public class AppOrderController {
|
|
|
return appOrderService.emptyShoppingTrolley(userId, shopId);
|
|
return appOrderService.emptyShoppingTrolley(userId, shopId);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
+ @Login
|
|
|
@ApiOperation("待取餐/配送")
|
|
@ApiOperation("待取餐/配送")
|
|
|
@GetMapping(value = "/waitTakeFood")
|
|
@GetMapping(value = "/waitTakeFood")
|
|
|
- public Result waitTakeFood( Integer orderType, Integer page, Integer limit, Integer status){
|
|
|
|
|
- Long userId = 2078L;
|
|
|
|
|
|
|
+ public Result waitTakeFood(@RequestAttribute Long userId, Integer orderType, Integer page, Integer limit, Integer status){
|
|
|
|
|
+
|
|
|
return appOrderService.waitTakeFood(userId, orderType, page, limit, status);
|
|
return appOrderService.waitTakeFood(userId, orderType, page, limit, status);
|
|
|
}
|
|
}
|
|
|
|
|
|