From 25a21b3f149aeab12123c915faa880e7c4ed7a21 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 31 七月 2024 15:22:42 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java | 77 +++++++++++++++++++++++++++-----------
1 files changed, 55 insertions(+), 22 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java
index f197278..8ef985d 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java
@@ -82,36 +82,69 @@
@Override
public OrderReturnVO saveOrderReturnRequest(OrderReturnDTO OrderReturnDTO) {
-
Order order = orderMapper.selectById(OrderReturnDTO.getOrderId());
+ OrderReturnRequest one=null;
if (order.getIsRequest()==2){
throw new ServiceException("该订单已有售后");
}
- order.setIsRequest(2);
- orderMapper.updateById(order);
- OrderReturnRequest orderReturnRequest = new OrderReturnRequest();
- orderReturnRequest.setOrderId(OrderReturnDTO.getOrderId());
- orderReturnRequest.setRequestTime(LocalDateTime.now());
- if (OrderReturnDTO.getRequestType().equals("REFUND")){
- orderReturnRequest.setRequestType(RequestTypeEnum.REFUND);
+ LambdaQueryWrapper<OrderReturnRequest> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(OrderReturnRequest::getOrderId,OrderReturnDTO.getOrderId());
+ OrderReturnRequest orderReturnRequest = this.getOne(wrapper);
+ if (orderReturnRequest!=null){
+ order.setIsRequest(2);
+ orderMapper.updateById(order);
+ orderReturnRequest.setOrderId(OrderReturnDTO.getOrderId());
+ orderReturnRequest.setRequestTime(LocalDateTime.now());
+ if (OrderReturnDTO.getRequestType().equals("REFUND")){
+ orderReturnRequest.setRequestType(RequestTypeEnum.REFUND);
+ }else{
+ orderReturnRequest.setRequestType(RequestTypeEnum.REFUNDS_AND_RETURNS);
+ }
+
+ orderReturnRequest.setRequestReason(OrderReturnDTO.getRequestReason());
+ orderReturnRequest.setStatus(ReturnRequestStatusEnum.TO_BE_REVIEWED);
+ orderReturnRequest.setAuditStatus(AuditStatusEnum.TO_BE_REVIEWED);
+ orderReturnRequest.setAlbum(OrderReturnDTO.getAlbum());
+ orderReturnRequest.setRemark(OrderReturnDTO.getRemark());
+ CustomConfig returnAddressUserName = sysUserClient.getconfig("RETURN_ADDRESS_USER_NAME").getData();
+ orderReturnRequest.setRecipientName(returnAddressUserName.getConfigValue());
+ CustomConfig returnAddressUserPhone = sysUserClient.getconfig("RETURN_ADDRESS_USER_PHONE").getData();
+ orderReturnRequest.setRecipientPhone(returnAddressUserPhone.getConfigValue());
+ CustomConfig returnAddressUserAddress = sysUserClient.getconfig("RETURN_ADDRESS_USER_ADDRESS").getData();
+ orderReturnRequest.setDetailedAddress(returnAddressUserAddress.getConfigValue());
+ this.updateById(orderReturnRequest);
+ one = this.getById(orderReturnRequest.getId());
}else{
- orderReturnRequest.setRequestType(RequestTypeEnum.REFUNDS_AND_RETURNS);
+ order.setIsRequest(2);
+ orderMapper.updateById(order);
+ OrderReturnRequest orderReturnRequest1 = new OrderReturnRequest();
+ orderReturnRequest1.setOrderId(OrderReturnDTO.getOrderId());
+ orderReturnRequest1.setRequestTime(LocalDateTime.now());
+ if (OrderReturnDTO.getRequestType().equals("REFUND")){
+ orderReturnRequest1.setRequestType(RequestTypeEnum.REFUND);
+ }else{
+ orderReturnRequest1.setRequestType(RequestTypeEnum.REFUNDS_AND_RETURNS);
+ }
+
+ orderReturnRequest1.setRequestReason(OrderReturnDTO.getRequestReason());
+ orderReturnRequest1.setStatus(ReturnRequestStatusEnum.TO_BE_REVIEWED);
+ orderReturnRequest1.setAuditStatus(AuditStatusEnum.TO_BE_REVIEWED);
+ orderReturnRequest1.setAlbum(OrderReturnDTO.getAlbum());
+ orderReturnRequest1.setRemark(OrderReturnDTO.getRemark());
+ CustomConfig returnAddressUserName = sysUserClient.getconfig("RETURN_ADDRESS_USER_NAME").getData();
+ orderReturnRequest1.setRecipientName(returnAddressUserName.getConfigValue());
+ CustomConfig returnAddressUserPhone = sysUserClient.getconfig("RETURN_ADDRESS_USER_PHONE").getData();
+ orderReturnRequest1.setRecipientPhone(returnAddressUserPhone.getConfigValue());
+ CustomConfig returnAddressUserAddress = sysUserClient.getconfig("RETURN_ADDRESS_USER_ADDRESS").getData();
+ orderReturnRequest1.setDetailedAddress(returnAddressUserAddress.getConfigValue());
+ this.save(orderReturnRequest1);
+ one = this.getById(orderReturnRequest1.getId());
}
- orderReturnRequest.setRequestReason(OrderReturnDTO.getRequestReason());
- orderReturnRequest.setStatus(ReturnRequestStatusEnum.TO_BE_REVIEWED);
- orderReturnRequest.setAuditStatus(AuditStatusEnum.TO_BE_REVIEWED);
- orderReturnRequest.setAlbum(OrderReturnDTO.getAlbum());
- orderReturnRequest.setRemark(OrderReturnDTO.getRemark());
- CustomConfig returnAddressUserName = sysUserClient.getconfig("RETURN_ADDRESS_USER_NAME").getData();
- orderReturnRequest.setRecipientName(returnAddressUserName.getConfigValue());
- CustomConfig returnAddressUserPhone = sysUserClient.getconfig("RETURN_ADDRESS_USER_PHONE").getData();
- orderReturnRequest.setRecipientPhone(returnAddressUserPhone.getConfigValue());
- CustomConfig returnAddressUserAddress = sysUserClient.getconfig("RETURN_ADDRESS_USER_ADDRESS").getData();
- orderReturnRequest.setDetailedAddress(returnAddressUserAddress.getConfigValue());
- this.save(orderReturnRequest);
- OrderReturnRequest one = this.getById(orderReturnRequest.getId());
+
+
+
OrderReturnVO orderReturnVO = BeanUtils.copyBean(one, OrderReturnVO.class);
return orderReturnVO;
--
Gitblit v1.7.1