修改用户订单列表

ruoyi-admin/src/main/java/com/ruoyi/app/order/PosOrderShOprateController.java

@@ -92,7 +92,7 @@ public class PosOrderShOprateController extends BaseController {
      */
     @Anonymous
     @Auth
-    @PostMapping("/completeOrder")
+    @GetMapping("/completeOrder")
     public AjaxResult completeOrder(@RequestHeader String token, @RequestParam Long id) {
         PosOrder order = posOrderService.getOne(new LambdaQueryWrapper<PosOrder>().eq(PosOrder::getId, id));
         if (order == null || order.getState() == null || order.getState() != 2L) {
@@ -115,7 +115,7 @@ public class PosOrderShOprateController extends BaseController {
      */
     @Anonymous
     @Auth
-    @PostMapping("/cancelOrder")
+    @GetMapping("/cancelOrder")
     public AjaxResult cancelOrder(@RequestHeader String token, @RequestParam Long id) {
         PosOrder order = posOrderService.getOne(new LambdaQueryWrapper<PosOrder>().eq(PosOrder::getId, id));
         if (order == null || order.getState() == null) {
@@ -181,6 +181,7 @@ public class PosOrderShOprateController extends BaseController {
 
     /**
      * 商家端订单列表（Tab分页）
+     * ta
      */
     @Anonymous
     @Auth

ruoyi-admin/src/main/java/com/ruoyi/app/order/UserOrderController.java

@@ -146,6 +146,10 @@ public class UserOrderController extends BaseController {
             posOrder.setAmount(item.getAmount());
             posOrder.setRemarks(item.getRemarks());
             posOrder.setType(item.getType());
+            //外卖设置配送状态为
+            if(0L==posOrder.getType()){
+                posOrder.setDeliveryStatus(0L);
+            }
             posOrder.setDelryTime(item.getDelryTime());
             posOrder.setFood(JSON.toJSONString(item.getFood()));
             if("1".equals(input.getPaymentMethod()) || "2".equals(input.getPaymentMethod())){