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