|
|
@@ -407,16 +407,16 @@ public class UserOrderController extends BaseController {
|
|
|
/**
|
|
|
* 确认取餐(自取类型订单,state=2 → state=3)
|
|
|
*/
|
|
|
- @PostMapping("/confirmPickup")
|
|
|
+ @GetMapping("/confirmPickup")
|
|
|
@Auth
|
|
|
@Anonymous
|
|
|
- public AjaxResult confirmPickup(@RequestHeader String token, @RequestParam String ddId) {
|
|
|
+ public AjaxResult confirmPickup(@RequestHeader String token, @RequestParam Long id) {
|
|
|
JwtUtil jwtUtil = new JwtUtil();
|
|
|
String userId = jwtUtil.getusid(token);
|
|
|
|
|
|
PosOrder order = posOrderService.getOne(
|
|
|
new LambdaQueryWrapper<PosOrder>()
|
|
|
- .eq(PosOrder::getDdId, ddId)
|
|
|
+ .eq(PosOrder::getId, id)
|
|
|
.eq(PosOrder::getUserId, Long.valueOf(userId))
|
|
|
);
|
|
|
if (order == null) {
|
|
|
@@ -442,16 +442,16 @@ public class UserOrderController extends BaseController {
|
|
|
/**
|
|
|
* 取消订单(未接单前,state=0 → state=4)
|
|
|
*/
|
|
|
- @PostMapping("/cancelOrder")
|
|
|
+ @GetMapping("/cancelOrder")
|
|
|
@Auth
|
|
|
@Anonymous
|
|
|
- public AjaxResult cancelOrder(@RequestHeader String token, @RequestParam String ddId) {
|
|
|
+ public AjaxResult cancelOrder(@RequestHeader String token, @RequestParam Long id) {
|
|
|
JwtUtil jwtUtil = new JwtUtil();
|
|
|
String userId = jwtUtil.getusid(token);
|
|
|
|
|
|
PosOrder order = posOrderService.getOne(
|
|
|
new LambdaQueryWrapper<PosOrder>()
|
|
|
- .eq(PosOrder::getDdId, ddId)
|
|
|
+ .eq(PosOrder::getId, id)
|
|
|
.eq(PosOrder::getUserId, Long.valueOf(userId))
|
|
|
);
|
|
|
if (order == null) {
|