From d36bb8b4ea60d1bb0d46bbc0c5dbc02aca86afcd Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 05 六月 2024 08:38:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 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 409850d..312fed7 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
@@ -1,10 +1,23 @@
package com.ruoyi.order.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.enums.AuditStatusEnum;
+import com.ruoyi.common.core.enums.ReturnRequestStatusEnum;
import com.ruoyi.order.domain.OrderReturnRequest;
import com.ruoyi.order.mapper.OrderReturnRequestMapper;
import com.ruoyi.order.service.IOrderReturnRequestService;
+import com.ruoyi.system.api.domain.CustomConfig;
+import com.ruoyi.system.api.domain.dto.OrderReturnDTO;
+import com.ruoyi.system.api.feignClient.SysUserClient;
+import com.ruoyi.system.api.util.HuaWeiOBSUtil;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
/**
* <p>
@@ -16,5 +29,45 @@
*/
@Service
public class OrderReturnRequestServiceImpl extends ServiceImpl<OrderReturnRequestMapper, OrderReturnRequest> implements IOrderReturnRequestService {
+ @Resource
+ private SysUserClient sysUserClient;
+ @Override
+ public void saveOrderReturnRequest(OrderReturnDTO OrderReturnDTO) {
+ OrderReturnRequest orderReturnRequest = new OrderReturnRequest();
+ orderReturnRequest.setOrderId(OrderReturnDTO.getOrderId());
+ orderReturnRequest.setRequestTime(LocalDateTime.now());
+ orderReturnRequest.setRequestType(OrderReturnDTO.getRequestType());
+ orderReturnRequest.setRequestReason(OrderReturnDTO.getRequestReason());
+ orderReturnRequest.setStatus(ReturnRequestStatusEnum.TO_BE_REVIEWED);
+ orderReturnRequest.setAuditStatus(AuditStatusEnum.TO_BE_REVIEWED);
+ List<String> urlList = new ArrayList<>();
+ if (OrderReturnDTO.getAlbum().length > 0) {
+ for (MultipartFile file : OrderReturnDTO.getAlbum()) {
+ try {
+ String url = HuaWeiOBSUtil.obsUpload(file);
+ urlList.add(url);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ orderReturnRequest.setAlbum(urlList.toString());
+ }
+
+ CustomConfig returnAddressUserName = sysUserClient.getconfig("RETURN_ADDRESS_USER_NAME").getData();
+ orderReturnRequest.setRecipientName(returnAddressUserName.getConfigName());
+ CustomConfig returnAddressUserPhone = sysUserClient.getconfig("RETURN_ADDRESS_USER_PHONE").getData();
+ orderReturnRequest.setRecipientPhone(returnAddressUserPhone.getConfigName());
+ CustomConfig returnAddressUserAddress = sysUserClient.getconfig("RETURN_ADDRESS_USER_ADDRESS").getData();
+ orderReturnRequest.setDetailedAddress(returnAddressUserAddress.getConfigName());
+ this.save(orderReturnRequest);
+
+ }
+
+ @Override
+ public void updOrderReturnRequest(OrderReturnDTO OrderReturnDTO) {
+ OrderReturnRequest byId = this.getById(OrderReturnDTO.getId());
+ byId.setCourierNumber(OrderReturnDTO.getCourierNumber());
+ this.updateById(byId);
+ }
}
--
Gitblit v1.7.1