From b72d0c996933f5e9f4da310a6172027eb9fad2d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=97=AD?= <2795210596@qq.com> Date: Mon, 21 Apr 2025 16:09:47 +0800 Subject: [PATCH] CueOrder --- .../manager/CreateOrderManager.java | 91 ++++++++++--------- 1 file changed, 47 insertions(+), 44 deletions(-) diff --git a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/manager/CreateOrderManager.java b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/manager/CreateOrderManager.java index 401b294..357fc03 100644 --- a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/manager/CreateOrderManager.java +++ b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/manager/CreateOrderManager.java @@ -184,32 +184,33 @@ public class CreateOrderManager { } // 两种情况会导致退货 5不合格 6价格不满意 // 检查当前状态 - if (!Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_FAIL.value()) || !Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_SUCCESS.value())) { + if (Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_FAIL.value()) || Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_SUCCESS.value())) { + CueOrder cueOrder = new CueOrder(); + cueOrder.setOrderId(orderId); + // 需要向order_addr插入一条数据 + ServerResponseEntity userAddrVO = userAddrFeignClient.cueGetUserAddrByAddrId(cueFillAddrDTO.getAddrId(), cueOrderVO.getUserId()); + if (userAddrVO.isSuccess()) { + // 将地址信息插入到order_addr中 + OrderAddrVO orderAddrVO = BeanUtil.toBean(userAddrVO, OrderAddrVO.class); + orderAddrVO.setUserId(cueOrderVO.getUserId()); + ServerResponseEntity longServerResponseEntity = orderAddrFeignClient.addCueAddr(orderAddrVO); + if (longServerResponseEntity.isSuccess()) { + cueOrder.setOrderAddrId(longServerResponseEntity.getData()); + } + } + if (Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_SUCCESS.value())) { + cueOrder.setOrderStatus(OrderStatus.CUE_EVALUATION_SUCCESS_PRICE_DISCONTENT.value()); + } else { + cueOrder.setOrderStatus(OrderStatus.CUE_EVALUATION_SUCCESS_COMPLETED.value()); + } + + cueOrder.setUpdateTime(DateUtil.date()); + cueOrderMapper.update(cueOrder); + this.updateOrderMall(null, cueOrderVO.getMallOrderId(), cueOrder.getOrderStatus()); + } else { throw new LuckException("状态已变更,请检查!"); } - CueOrder cueOrder = new CueOrder(); - cueOrder.setOrderId(orderId); - // 需要向order_addr插入一条数据 - ServerResponseEntity userAddrVO = userAddrFeignClient.cueGetUserAddrByAddrId(cueFillAddrDTO.getAddrId(), cueOrderVO.getUserId()); - if (userAddrVO.isSuccess()) { - // 将地址信息插入到order_addr中 - OrderAddrVO orderAddrVO = BeanUtil.toBean(userAddrVO, OrderAddrVO.class); - orderAddrVO.setUserId(cueOrderVO.getUserId()); - ServerResponseEntity longServerResponseEntity = orderAddrFeignClient.addCueAddr(orderAddrVO); - if (longServerResponseEntity.isSuccess()) { - cueOrder.setOrderAddrId(longServerResponseEntity.getData()); - } - } - if (Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_SUCCESS.value())) { - cueOrder.setOrderStatus(OrderStatus.CUE_EVALUATION_SUCCESS_PRICE_DISCONTENT.value()); - } else { - cueOrder.setOrderStatus(OrderStatus.CUE_EVALUATION_SUCCESS_COMPLETED.value()); - } - - cueOrder.setUpdateTime(DateUtil.date()); - cueOrderMapper.update(cueOrder); - this.updateOrderMall(null, cueOrderVO.getMallOrderId(), cueOrder.getOrderStatus()); } /** @@ -222,28 +223,30 @@ public class CreateOrderManager { if (ObjectUtil.isNull(cueOrderVO)) { throw new LuckException("订单不存在,请检查!"); } - if (!Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_FAIL_FILLED_RETURN_ADDRESS.value()) || !Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_SUCCESS_PRICE_DISCONTENT.value())) { + if (Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_FAIL_FILLED_RETURN_ADDRESS.value()) || Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_SUCCESS_PRICE_DISCONTENT.value())) { + + CueOrder cueOrder = new CueOrder(); + cueOrder.setOrderId(cueRetractedDTO.getOrderId()); + cueOrder.setOutletConfigId(cueRetractedDTO.getOutletConfigId()); + cueOrder.setPrinterId(cueRetractedDTO.getPrinterId()); + CurOderReturnsDTO curOderReturnsDTO = new CurOderReturnsDTO(); + curOderReturnsDTO.setOrderId(cueOrderVO.getMallOrderId()); + curOderReturnsDTO.setOutletConfigId(cueRetractedDTO.getOutletConfigId()); + curOderReturnsDTO.setPrinterId(cueRetractedDTO.getPrinterId()); + curOderReturnsDTO.setOrderAddrId(cueOrderVO.getOrderAddrId()); + ServerResponseEntity stringServerResponseEntity = deliveryFeignClient.curOderReturns(curOderReturnsDTO); + if (stringServerResponseEntity.isSuccess()) { + cueOrder.setBackTrackingNumber(stringServerResponseEntity.getData()); + } + // 判断状态 + if (Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_FAIL_FILLED_RETURN_ADDRESS.value())) { + cueOrder.setOrderStatus(OrderStatus.CUE_EVALUATION_FAIL_COMPLETED.value()); + } else { + cueOrder.setOrderStatus(OrderStatus.CUE_EVALUATION_SUCCESS_COMPLETED.value()); + } + cueOrderMapper.update(cueOrder); + } else { throw new LuckException("状态已变更,请检查!"); } - CueOrder cueOrder = new CueOrder(); - cueOrder.setOrderId(cueRetractedDTO.getOrderId()); - cueOrder.setOutletConfigId(cueRetractedDTO.getOutletConfigId()); - cueOrder.setPrinterId(cueRetractedDTO.getPrinterId()); - CurOderReturnsDTO curOderReturnsDTO = new CurOderReturnsDTO(); - curOderReturnsDTO.setOrderId(cueOrderVO.getMallOrderId()); - curOderReturnsDTO.setOutletConfigId(cueRetractedDTO.getOutletConfigId()); - curOderReturnsDTO.setPrinterId(cueRetractedDTO.getPrinterId()); - curOderReturnsDTO.setOrderAddrId(cueOrderVO.getOrderAddrId()); - ServerResponseEntity stringServerResponseEntity = deliveryFeignClient.curOderReturns(curOderReturnsDTO); - if (stringServerResponseEntity.isSuccess()) { - cueOrder.setBackTrackingNumber(stringServerResponseEntity.getData()); - } - // 判断状态 - if (Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_FAIL_FILLED_RETURN_ADDRESS.value())) { - cueOrder.setOrderStatus(OrderStatus.CUE_EVALUATION_FAIL_COMPLETED.value()); - } else { - cueOrder.setOrderStatus(OrderStatus.CUE_EVALUATION_SUCCESS_COMPLETED.value()); - } - cueOrderMapper.update(cueOrder); } } \ No newline at end of file