From c9f0d1c385f38c016822cb8c29b054f6089836ad Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080> Date: Wed, 27 Dec 2023 16:16:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=84=E7=90=86=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E5=A1=AB=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ocessorProcessingStatusStatusConstant.java | 3 +- .../aftersales/WorkOrderStatusConstant.java | 1 + .../AftersalesWorkOrderController.java | 16 ++++- .../service/IAftersalesWorkOrderService.java | 7 ++- .../impl/AftersalesWorkOrderServiceImpl.java | 58 +++++++++++++++---- 5 files changed, 71 insertions(+), 14 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/aftersales/ProcessorProcessingStatusStatusConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/aftersales/ProcessorProcessingStatusStatusConstant.java index e6fe45dba..8bf2d8a2d 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/aftersales/ProcessorProcessingStatusStatusConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/aftersales/ProcessorProcessingStatusStatusConstant.java @@ -4,7 +4,8 @@ public enum ProcessorProcessingStatusStatusConstant { daichuli("待处理","1"), yichuli("已处理","2"), yichaoshi("已超时","3"), - tijiaofang("处理结果提交方","4") + tijiaofang("处理结果提交方","4"), + qitachuli("其他处理","5") ; ProcessorProcessingStatusStatusConstant(String name, String value) { diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/aftersales/WorkOrderStatusConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/aftersales/WorkOrderStatusConstant.java index b03e79530..1002843c2 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/aftersales/WorkOrderStatusConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/aftersales/WorkOrderStatusConstant.java @@ -5,6 +5,7 @@ public enum WorkOrderStatusConstant { daichuli("待处理","10"), yichuli("已处理","30"), chulizhong("处理中","20"), + chulijeiguoyitianxei("处理结果已填写","21"), daishenhe("待审核","40"), yishenhe("已审核","50"), chaoshiweichuli("超时未处理","60"), diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java index 9b0c1ca47..d867a88a0 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java @@ -377,7 +377,7 @@ public class AftersalesWorkOrderController extends BladeController { } /** - * 客服异常工单 修改 + * 客服异常工单 修改 可修改订单状态 */ @PostMapping("/update") @ApiOperationSupport(order = 5) @@ -387,6 +387,20 @@ public class AftersalesWorkOrderController extends BladeController { return R.status(aftersalesWorkOrderService.updateById(aftersalesWorkOrder)); } + /** + * 客服异常工单 修改 可修改订单状态 + */ + @PutMapping("/updateWorkOrderStatus") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改订单状态", notes = "传入aftersalesWorkOrder") + public R updateWorkOrderStatus(@Valid @RequestBody AftersalesWorkOrderDTO aftersalesWorkOrder) { + log.info("修改参数》》》{}",aftersalesWorkOrder.toString()); + if(aftersalesWorkOrder.getAssignList().isEmpty()){ + throw new ServiceException("修改工单数据ID不能为空!!"); + } + return R.status(aftersalesWorkOrderService.updateWorkOrderStatus(aftersalesWorkOrder)); + } + /** * 客服异常工单 钉钉流程号、审核人、审核日期,财务理赔入账日期、操作人 */ diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java index e00263f06..ebfdb66cd 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java @@ -252,5 +252,10 @@ public interface IAftersalesWorkOrderService extends BaseService processorVOS = list.stream().map( i ->{ - AftersalesProcessorVO processorVO = new AftersalesProcessorVO(); - BeanUtil.copyProperties(i,processorVO); - return processorVO; + if(i.getProcessingStatus().equals(ProcessorProcessingStatusStatusConstant.daichuli.getValue())){ + AftersalesProcessorVO processorVO = new AftersalesProcessorVO(); + BeanUtil.copyProperties(i,processorVO); + return processorVO; + } + return null; }).collect(Collectors.toList()); aftersalesWorkOrderVO.setProcessorVOList(processorVOS); @@ -1218,7 +1225,10 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl{ + AftersalesProcessorEntity processor = new AftersalesProcessorEntity(); + processor.setId(i.getId()); + processor.setProcessingStatus(ProcessorProcessingStatusStatusConstant.qitachuli.getValue()); + aftersalesProcessorService.updateById(processor); + }); + List list1 = aftersalesReplyingPartyService.list(Wrappers.query().lambda() + .eq(AftersalesReplyingPartyEntity::getWorkOrderId, aftersalesWorkOrderDTO.getId()) + ); + list1.stream().forEach(i ->{ + AftersalesReplyingPartyEntity replyingPartyEntity = new AftersalesReplyingPartyEntity(); + replyingPartyEntity.setId(i.getId()); + replyingPartyEntity.setDifference("3"); + aftersalesReplyingPartyService.updateById(replyingPartyEntity); + }); }else{ Optional first = list.stream().filter(i -> i.getBusinessId().equals(myCurrentWarehouse.getId()) && i.getBusinessName().equals(myCurrentWarehouse.getName())).findFirst(); if(first.isPresent()){ @@ -1606,6 +1626,22 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl{ + AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity(); + workOrderEntity.setId(i); + workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.yichuli.getValue()); + baseMapper.updateById(workOrderEntity); + }); + return true; + } + /** * 添加处理处理方信息 * @param aftersalesWorkOrderDTO