clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

混合单列表查询排序

This commit is contained in:
donqi 2023-07-23 00:08:18 +08:00
parent 81ccbc40bc
commit b95dcce2b4
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -785,7 +785,7 @@ public class OrderController extends BaseController {
} }
/** /**
* 查询主单子单的混合列表，根据预约时间倒序排列，请求参数中的师傅id不能为空 * 查询主单子单的混合列表
*/ */
@PostMapping("/app/mix/order/list") @PostMapping("/app/mix/order/list")
@ResponseBody @ResponseBody
@ -830,11 +830,15 @@ public class OrderController extends BaseController {
orderListResponses.addAll(masterList); orderListResponses.addAll(masterList);
} }
// 根据预约时间倒序排列 // 查询新订单列表根据创建时间倒叙排列，查询其他根据更新时间倒序排列
Collections.sort(orderListResponses, new Comparator<OrderListResponse>() { Collections.sort(orderListResponses, new Comparator<OrderListResponse>() {
@Override @Override
public int compare(OrderListResponse o1, OrderListResponse o2) { public int compare(OrderListResponse o1, OrderListResponse o2) {
return o1.getExpectTimeStart().compareTo(o2.getExpectTimeStart()); if (Objects.equals(orderListRequest.getOrderStatus(), 0) || Objects.equals(orderListRequest.getTimeout(), 1)) {
return o2.getCreateTime().compareTo(o1.getCreateTime());
} else {
return o2.getUpdateTime().compareTo(o1.getUpdateTime());
}
} }
}); });
@ -879,11 +883,11 @@ public class OrderController extends BaseController {
} }
orderListResponses.addAll(filteredMasterList); orderListResponses.addAll(filteredMasterList);
// 根据预约时间倒序排列 // 根据更新时间倒序排列
Collections.sort(orderListResponses, new Comparator<OrderListResponse>() { Collections.sort(orderListResponses, new Comparator<OrderListResponse>() {
@Override @Override
public int compare(OrderListResponse o1, OrderListResponse o2) { public int compare(OrderListResponse o1, OrderListResponse o2) {
return o1.getExpectTimeStart().compareTo(o2.getExpectTimeStart()); return o2.getUpdateTime().compareTo(o1.getUpdateTime());
} }
}); });
@ -1014,6 +1018,8 @@ public class OrderController extends BaseController {
orderListResponse.setTimeout(master.getTimeout()); orderListResponse.setTimeout(master.getTimeout());
orderListResponse.setTimeoutFineTimes(master.getTimeoutFineTimes()); orderListResponse.setTimeoutFineTimes(master.getTimeoutFineTimes());
orderListResponse.setAfterServiceRecordList(afterServiceRecords); orderListResponse.setAfterServiceRecordList(afterServiceRecords);
orderListResponse.setCreateTime(master.getCreateTime());
orderListResponse.setUpdateTime(master.getUpdateTime());
orderListResponses.add(orderListResponse); orderListResponses.add(orderListResponse);
}); });
@ -1142,6 +1148,8 @@ public class OrderController extends BaseController {
orderListResponse.setChangeMoney(changeMoney); orderListResponse.setChangeMoney(changeMoney);
orderListResponse.setDrawCashStatus(detail.getDrawCashStatus()); orderListResponse.setDrawCashStatus(detail.getDrawCashStatus());
orderListResponse.setDrawCashTime(detail.getDrawCashTime()); orderListResponse.setDrawCashTime(detail.getDrawCashTime());
orderListResponse.setCreateTime(detail.getCreateTime());
orderListResponse.setUpdateTime(detail.getUpdateTime());
orderListResponses.add(orderListResponse); orderListResponses.add(orderListResponse);
}); });
return orderListResponses; return orderListResponses;
@ -1238,6 +1246,8 @@ public class OrderController extends BaseController {
orderListResponse.setChangeMoney(changeMoney); orderListResponse.setChangeMoney(changeMoney);
orderListResponse.setServerMoney(financialMaster.getServerMoney()); orderListResponse.setServerMoney(financialMaster.getServerMoney());
orderListResponse.setAfterServiceRecordList(afterServiceRecords); orderListResponse.setAfterServiceRecordList(afterServiceRecords);
orderListResponse.setCreateTime(master.getCreateTime());
orderListResponse.setUpdateTime(master.getUpdateTime());
orderListResponses.add(orderListResponse); orderListResponses.add(orderListResponse);
} }
@ -1328,6 +1338,8 @@ public class OrderController extends BaseController {
orderListResponse.setTimeout(detail.getTimeout()); orderListResponse.setTimeout(detail.getTimeout());
orderListResponse.setTimeoutFineTimes(detail.getTimeoutFineTimes()); orderListResponse.setTimeoutFineTimes(detail.getTimeoutFineTimes());
orderListResponse.setChangeMoney(changeMoney); orderListResponse.setChangeMoney(changeMoney);
orderListResponse.setCreateTime(detail.getCreateTime());
orderListResponse.setUpdateTime(detail.getUpdateTime());
// orderListResponse.setAfterServiceRecordList(afterServiceRecordList); // orderListResponse.setAfterServiceRecordList(afterServiceRecordList);
orderListResponses.add(orderListResponse); orderListResponses.add(orderListResponse);
} }