From 3d7dd6bb2c388946dddff4ec9c5fa353590aaac9 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 18 Nov 2024 18:43:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=A8=A1=E5=9D=97=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/mapper/PurchaseBindMapper.java | 2 +- .../service/impl/PurchaseBindServiceImpl.java | 116 +++++++++--------- .../impl/PurchaseStorageServiceImpl.java | 9 +- 3 files changed, 64 insertions(+), 63 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseBindMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseBindMapper.java index 7ca6cf1b..2f7c0f96 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseBindMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseBindMapper.java @@ -80,7 +80,7 @@ public interface PurchaseBindMapper { * @param updatedStatus * @param purchaseId */ - void updateStatusById(@Param("updatedStatus") Integer updatedStatus, @Param("id") String purchaseId); + int updateStatusById(@Param("updatedStatus") Integer updatedStatus, @Param("id") String purchaseId); /** * 更新数量 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java index 7c72d0c8..0ace2e12 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java @@ -158,17 +158,17 @@ public class PurchaseBindServiceImpl implements IPurchaseBindService { } } } - PurchaseDto purchaseDto = new PurchaseDto(); - purchaseDto.setTaskId(dto.getTaskId()); - List list = purchaseBindMapper.getDetails(purchaseDto); - Map> groupedByIdStatus = list.stream() - .collect(Collectors.groupingBy( - PurchaseVo::getTaskId, - Collectors.mapping(PurchaseVo::getStatus, Collectors.toList()) - )); - result += groupedByIdStatus.entrySet().stream() - .mapToInt(entry -> updateTaskStatus(entry.getKey(), entry.getValue())) - .sum(); +// PurchaseDto purchaseDto = new PurchaseDto(); +// purchaseDto.setTaskId(dto.getTaskId()); +// List list = purchaseBindMapper.getDetails(purchaseDto); +// Map> groupedByIdStatus = list.stream() +// .collect(Collectors.groupingBy( +// PurchaseVo::getTaskId, +// Collectors.mapping(PurchaseVo::getStatus, Collectors.toList()) +// )); +// result += groupedByIdStatus.entrySet().stream() +// .mapToInt(entry -> updateTaskStatus(entry.getKey(), entry.getValue())) +// .sum(); if (result > 0) { return AjaxResult.success("绑定成功"); } @@ -181,17 +181,17 @@ public class PurchaseBindServiceImpl implements IPurchaseBindService { * @param statusList * @return */ - private int updateTaskStatus(Integer taskId, List statusList) { - if (statusList.contains(PurchaseTaskStatusEnum.TO_STORE_AFTER_REJECT.getStatus()) || - statusList.contains(PurchaseTaskStatusEnum.TO_BIND.getStatus())) { - return tmTaskMapper.updateStatusById(MaterialConstants.TEN_CONSTANT, taskId.toString()); - } else if (!statusList.contains(PurchaseTaskStatusEnum.TO_STORE_AFTER_REJECT.getStatus()) && - !statusList.contains(PurchaseTaskStatusEnum.TO_BIND.getStatus()) && - statusList.contains(PurchaseTaskStatusEnum.TO_STORE.getStatus())) { - return tmTaskMapper.updateStatusById(PurchaseTaskStatusEnum.IN_STORE.getStatus(), taskId.toString()); - } - return 0; - } +// private int updateTaskStatus(Integer taskId, List statusList) { +// if (statusList.contains(PurchaseTaskStatusEnum.TO_STORE_AFTER_REJECT.getStatus()) || +// statusList.contains(PurchaseTaskStatusEnum.TO_BIND.getStatus())) { +// return tmTaskMapper.updateStatusById(MaterialConstants.TEN_CONSTANT, taskId.toString()); +// } else if (!statusList.contains(PurchaseTaskStatusEnum.TO_STORE_AFTER_REJECT.getStatus()) && +// !statusList.contains(PurchaseTaskStatusEnum.TO_BIND.getStatus()) && +// statusList.contains(PurchaseTaskStatusEnum.TO_STORE.getStatus())) { +// return tmTaskMapper.updateStatusById(PurchaseTaskStatusEnum.IN_STORE.getStatus(), taskId.toString()); +// } +// return 0; +// } /** * 下载二维码 @@ -243,27 +243,27 @@ public class PurchaseBindServiceImpl implements IPurchaseBindService { } } } - result += tmTaskMapper.updateStatusById(MaterialConstants.TEN_CONSTANT, dto.getTaskId()); + //result += tmTaskMapper.updateStatusById(MaterialConstants.TEN_CONSTANT, dto.getTaskId()); } //二级页面驳回 if (dto.getPurchaseId() != null) { List idList = Arrays.asList(dto.getPurchaseId().split(",")); for (String purchaseId : idList) { - purchaseBindMapper.updateStatusById(PurchaseTaskStatusEnum.TO_BIND_AFTER_REJECT.getStatus(), purchaseId); - } - for (String id : idList) { - //根据二级页面驳回状态更新任务状态 - dto.setPurchaseId(id); - List list = purchaseBindMapper.getDetails(dto); - if (CollectionUtils.isNotEmpty(list)) { - for (PurchaseVo purchaseVo : list) { - PurchaseDto purchaseDto = new PurchaseDto(); - purchaseDto.setTaskId(purchaseVo.getTaskId().toString()); - List voList = purchaseBindMapper.getDetails(purchaseDto); - result = getResult(result, voList); - } - } + result += purchaseBindMapper.updateStatusById(PurchaseTaskStatusEnum.TO_BIND_AFTER_REJECT.getStatus(), purchaseId); } +// for (String id : idList) { +// //根据二级页面驳回状态更新任务状态 +// dto.setPurchaseId(id); +// List list = purchaseBindMapper.getDetails(dto); +// if (CollectionUtils.isNotEmpty(list)) { +// for (PurchaseVo purchaseVo : list) { +// PurchaseDto purchaseDto = new PurchaseDto(); +// purchaseDto.setTaskId(purchaseVo.getTaskId().toString()); +// List voList = purchaseBindMapper.getDetails(purchaseDto); +// result = getResult(result, voList); +// } +// } +// } } if (result > 0) { return AjaxResult.success("操作成功"); @@ -277,27 +277,27 @@ public class PurchaseBindServiceImpl implements IPurchaseBindService { * @param voList * @return */ - private int getResult(int result, List voList) { - Map> groupedByIdStatus = voList.stream() - .collect(Collectors.groupingBy( - PurchaseVo::getTaskId, - Collectors.mapping(PurchaseVo::getStatus, Collectors.toList()) - )); - result += groupedByIdStatus.entrySet().stream() - .mapToInt(entry -> { - Integer taskId = entry.getKey(); - List statusList = entry.getValue(); - if (statusList.contains(PurchaseTaskStatusEnum.TO_BIND_AFTER_REJECT.getStatus()) || - statusList.contains(PurchaseTaskStatusEnum.TO_BIND.getStatus())) { - return tmTaskMapper.updateStatusById(MaterialConstants.TEN_CONSTANT, taskId.toString()); - } else if (!statusList.contains(PurchaseTaskStatusEnum.TO_BIND_AFTER_REJECT.getStatus()) && !statusList.contains(PurchaseTaskStatusEnum.TO_BIND.getStatus()) - && statusList.contains(PurchaseTaskStatusEnum.TO_STORE.getStatus())) { - return tmTaskMapper.updateStatusById(PurchaseTaskStatusEnum.IN_STORE.getStatus(), taskId.toString()); - } - return 0; - }).sum(); - return result; - } +// private int getResult(int result, List voList) { +// Map> groupedByIdStatus = voList.stream() +// .collect(Collectors.groupingBy( +// PurchaseVo::getTaskId, +// Collectors.mapping(PurchaseVo::getStatus, Collectors.toList()) +// )); +// result += groupedByIdStatus.entrySet().stream() +// .mapToInt(entry -> { +// Integer taskId = entry.getKey(); +// List statusList = entry.getValue(); +// if (statusList.contains(PurchaseTaskStatusEnum.TO_BIND_AFTER_REJECT.getStatus()) || +// statusList.contains(PurchaseTaskStatusEnum.TO_BIND.getStatus())) { +// return tmTaskMapper.updateStatusById(MaterialConstants.TEN_CONSTANT, taskId.toString()); +// } else if (!statusList.contains(PurchaseTaskStatusEnum.TO_BIND_AFTER_REJECT.getStatus()) && !statusList.contains(PurchaseTaskStatusEnum.TO_BIND.getStatus()) +// && statusList.contains(PurchaseTaskStatusEnum.TO_STORE.getStatus())) { +// return tmTaskMapper.updateStatusById(PurchaseTaskStatusEnum.IN_STORE.getStatus(), taskId.toString()); +// } +// return 0; +// }).sum(); +// return result; +// } /** * 内层二维码下载 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java index 09431f89..0316657a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java @@ -317,10 +317,11 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService { .mapToInt(entry -> { Integer id = entry.getKey(); List statusList = entry.getValue(); - if (statusList.contains(PurchaseTaskStatusEnum.TO_STORE.getStatus()) || statusList.contains(PurchaseTaskStatusEnum.TO_STORE_AFTER_REJECT.getStatus())) { - return tmTaskMapper.updateStatusById(PurchaseTaskStatusEnum.TASK_IN_PROGRESS.getStatus(), id.toString()); - } else if (!statusList.contains(PurchaseTaskStatusEnum.TO_STORE.getStatus()) && !statusList.contains(PurchaseTaskStatusEnum.TO_STORE_AFTER_REJECT.getStatus()) - && statusList.stream().allMatch(status -> status.equals(PurchaseTaskStatusEnum.IN_STORE.getStatus()))) { +// if (statusList.contains(PurchaseTaskStatusEnum.TO_STORE.getStatus()) || statusList.contains(PurchaseTaskStatusEnum.TO_STORE_AFTER_REJECT.getStatus())) { +// return tmTaskMapper.updateStatusById(PurchaseTaskStatusEnum.TASK_IN_PROGRESS.getStatus(), id.toString()); +// } else + if (!statusList.contains(PurchaseTaskStatusEnum.TO_STORE.getStatus()) && !statusList.contains(PurchaseTaskStatusEnum.TO_STORE_AFTER_REJECT.getStatus()) + && statusList.stream().allMatch(status -> status.equals(PurchaseTaskStatusEnum.IN_STORE.getStatus()))) { return tmTaskMapper.updateStatusById(PurchaseTaskStatusEnum.TASK_FINISHED.getStatus(), id.toString()); } return 0;