|
|
@@ -9,6 +9,7 @@ import com.ruoyi.app.order.dto.OrderPushBodyDto;
|
|
|
import com.ruoyi.app.utils.PayPush;
|
|
|
import com.ruoyi.app.utils.event.PushEventService;
|
|
|
import com.ruoyi.common.annotation.Anonymous;
|
|
|
+import com.ruoyi.common.core.controller.BaseController;
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
import com.ruoyi.framework.manager.AsyncManager;
|
|
|
@@ -32,7 +33,7 @@ import java.util.TimerTask;
|
|
|
*/
|
|
|
@RestController
|
|
|
@RequestMapping("/system/orderShOprate")
|
|
|
-public class PosOrderShOprateController {
|
|
|
+public class PosOrderShOprateController extends BaseController {
|
|
|
@Autowired
|
|
|
private IPosOrderService posOrderService;
|
|
|
@Autowired
|
|
|
@@ -45,13 +46,13 @@ public class PosOrderShOprateController {
|
|
|
/**
|
|
|
* 商家出餐
|
|
|
* @param token
|
|
|
- * @param ddId
|
|
|
+ * @param id
|
|
|
* @return
|
|
|
*/
|
|
|
@Anonymous
|
|
|
@GetMapping("/dispatchOrder")
|
|
|
- public AjaxResult dispatchOrder(@RequestHeader String token, @RequestParam Long ddId){
|
|
|
- PosOrder order=posOrderService.getOne(new LambdaQueryWrapper<PosOrder>().eq(PosOrder::getDdId,ddId));
|
|
|
+ public AjaxResult dispatchOrder(@RequestHeader String token, @RequestParam Long id){
|
|
|
+ PosOrder order=posOrderService.getOne(new LambdaQueryWrapper<PosOrder>().eq(PosOrder::getDdId,id));
|
|
|
PosOrder update=new PosOrder();
|
|
|
update.setId(order.getId());
|
|
|
update.setDiningStatus(1L);
|