Ver Fonte

修改用户订单列表

qmj há 1 mês atrás
pai
commit
32398f6186

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

@@ -337,7 +337,7 @@ public class UserOrderController extends BaseController {
     public AjaxResult orderList(@RequestHeader String token,
                                 @RequestParam(defaultValue = "1") int page,
                                 @RequestParam(defaultValue = "10") int size,
-                                @RequestParam String tab,
+                                @RequestParam(required = false) String tab,
                                 @RequestParam(required = false) String type) {
         JwtUtil jwtUtil = new JwtUtil();
         String userId = jwtUtil.getusid(token);
@@ -369,7 +369,7 @@ public class UserOrderController extends BaseController {
                 wrapper.gt(PosOrder::getAfterSaleStatus, 0L);
                 break;
             default:
-                throw new ServiceException("无效的tab参数");
+               break;
         }
         wrapper.orderByDesc(PosOrder::getCretim);
 
@@ -388,7 +388,7 @@ public class UserOrderController extends BaseController {
         data.put("total", result.getTotal());
         data.put("page", page);
         data.put("size", size);
-        return success(data);
+        return success(result);
     }
 
     private void enrichOrderData(PosOrder order) {