tangfang/pangd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

相册部分代码提交

Browse Source
This commit is contained in:
dmy
2025-06-19 15:25:14 +08:00
parent 92b6efc9b5
commit 16ffe6d9a6
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/com/pangding/web/order/service/user/impl/UserOrderByPhoneServiceImpl.java
View File

@@ -148,15 +148,7 @@ public class UserOrderByPhoneServiceImpl implements UserOrderByPhoneService {
PageSizeData<OrderDetailResVo> orderDetailResVoPageSizeData = orderDao.findAlbumOrderList(req);
List<OrderDetailResVo> list = orderDetailResVoPageSizeData.getList();
List<String> orderIds = new ArrayList<>();
for (OrderDetailResVo orderDetailResVo : list) {
orderIds.add(orderDetailResVo.getId());
}
AlbumCentralEditTaskReqVo taskReqVo = new AlbumCentralEditTaskReqVo();
taskReqVo.setOrderIds(orderIds);
//查询上传
List<AlbumCentralEditTaskResVo> taskList = scenicFeign.editTaskLoad(taskReqVo).check();
Set<OrderDetailResVo> resultSet = new HashSet<>();
//返回参数需剔除
Map<String, OrderDetailResVo> orderMap = new HashMap<>();
for (OrderDetailResVo orderDetailResVo : list) {
Date today = DateHelper.getDateTime(DateHelper.getToday());
Date play = DateHelper.getDateTime(orderDetailResVo.getPlayDate().substring(0, 10) + " 23:59:59");
@@ -164,22 +156,31 @@ public class UserOrderByPhoneServiceImpl implements UserOrderByPhoneService {
if (DateHelper.compare(play, today) == 1) {
continue;
}
if (taskList.size() > 0) {
for (AlbumCentralEditTaskResVo taskResVo : taskList) {
if (!StringHelper.isEmpty(taskResVo.getOrderId())
&& orderDetailResVo.getId().equals(taskResVo.getOrderId())
&& taskResVo.getTaskStatus() == 3) {
continue;
}
resultSet.add(orderDetailResVo);
}
} else {
resultSet.add(orderDetailResVo);
if (orderDetailResVo.getOrderStatus() == 2
|| orderDetailResVo.getOrderStatus() == 5
|| orderDetailResVo.getOrderStatus() == 9) {
orderIds.add(orderDetailResVo.getId());
orderMap.put(orderDetailResVo.getId(), orderDetailResVo);
}
}
List<OrderDetailResVo> resultList = new ArrayList<>(resultSet);
AlbumCentralEditTaskReqVo taskReqVo = new AlbumCentralEditTaskReqVo();
taskReqVo.setOrderIds(orderIds);
//查询上传
List<AlbumCentralEditTaskResVo> taskList = scenicFeign.editTaskLoad(taskReqVo).check();
if (taskList.size() > 0) {
for (AlbumCentralEditTaskResVo taskResVo : taskList) {
OrderDetailResVo order = orderMap.get(taskResVo.getOrderId());
if (!StringHelper.isEmpty(taskResVo.getOrderId())
&& !StringHelper.isEmpty(order)
&& taskResVo.getTaskStatus() == 3) {
orderMap.remove(order.getId());
}
}
}
List<OrderDetailResVo> resultList = new ArrayList<>(orderMap.values());
orderDetailResVoPageSizeData.setList(resultList);
return orderDetailResVoPageSizeData;
}