From 941c656739a1fedb21d58fd8c63ade74a4f6a275 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 10 Jul 2025 15:51:49 +0800
Subject: [PATCH] 审核退款订单
---
oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnOperationLogController.java | 14 ++++++--------
oying-system/src/main/resources/mapper/sh/OrderReturnOperationLogMapper.xml | 9 ++++++++-
oying-system/src/main/java/com/oying/modules/sh/mapper/OrderReturnOperationLogMapper.java | 2 ++
oying-system/src/main/java/com/oying/modules/sh/service/OrderReturnService.java | 3 +++
oying-system/src/main/java/com/oying/modules/sh/service/OrderReturnOperationLogService.java | 2 ++
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java | 7 +++++++
oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnController.java | 10 ++++++++++
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnOperationLogServiceImpl.java | 12 ++++++++----
8 files changed, 46 insertions(+), 13 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/mapper/OrderReturnOperationLogMapper.java b/oying-system/src/main/java/com/oying/modules/sh/mapper/OrderReturnOperationLogMapper.java
index 9a9ffd8..401243f 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/mapper/OrderReturnOperationLogMapper.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/mapper/OrderReturnOperationLogMapper.java
@@ -19,4 +19,6 @@
IPage<OrderReturnOperationLog> findAll(@Param("criteria") OrderReturnOperationLogQueryCriteria criteria, Page<Object> page);
List<OrderReturnOperationLog> findAll(@Param("criteria") OrderReturnOperationLogQueryCriteria criteria);
+
+ List<OrderReturnOperationLog> getByReturnNum(String returnNum);
}
diff --git a/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnController.java b/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnController.java
index b073f74..c58992a 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnController.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnController.java
@@ -2,6 +2,7 @@
import com.oying.annotation.Log;
import com.oying.modules.sh.domain.OrderReturn;
+import com.oying.modules.sh.domain.request.AuditOrderReturn;
import com.oying.modules.sh.service.OrderReturnService;
import com.oying.modules.sh.domain.dto.OrderReturnQueryCriteria;
import com.oying.utils.R;
@@ -57,6 +58,15 @@
return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
}
+ @PutMapping("audit")
+ @Log("审核退款订单")
+ @ApiOperation("审核退款订单")
+ @PreAuthorize("@el.check('orderReturn:edit')")
+ public ResponseEntity<Object> audit(@Validated @RequestBody AuditOrderReturn resources) {
+ orderReturnService.audit(resources);
+ return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
+ }
+
@PutMapping
@Log("修改退款订单")
@ApiOperation("修改退款订单")
diff --git a/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnOperationLogController.java b/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnOperationLogController.java
index 3a9072f..fa07c1d 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnOperationLogController.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnOperationLogController.java
@@ -4,6 +4,7 @@
import com.oying.modules.sh.domain.OrderReturnOperationLog;
import com.oying.modules.sh.service.OrderReturnOperationLogService;
import com.oying.modules.sh.domain.dto.OrderReturnOperationLogQueryCriteria;
+import com.oying.utils.R;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -22,7 +23,7 @@
**/
@RestController
@RequiredArgsConstructor
-@Api(tags = "退订用户操作管理")
+@Api(tags = "SH：退订用户操作管理")
@RequestMapping("/api/orderReturnOperationLog")
public class OrderReturnOperationLogController {
@@ -43,12 +44,9 @@
return new ResponseEntity<>(orderReturnOperationLogService.queryAll(criteria,page),HttpStatus.OK);
}
- @PostMapping
- @Log("新增退订用户操作管理")
- @ApiOperation("新增退订用户操作管理")
- @PreAuthorize("@el.check('orderReturnOperationLog:add')")
- public ResponseEntity<Object> createOrderReturnOperationLog(@Validated @RequestBody OrderReturnOperationLog resources){
- orderReturnOperationLogService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
+ @GetMapping("getByReturnNum")
+ @ApiOperation("根据退单号查询退单操作日志")
+ public ResponseEntity<Object> getByReturnNum(@RequestParam String returnNum) {
+ return new ResponseEntity<>(R.success(orderReturnOperationLogService.getByReturnNum(returnNum)), HttpStatus.OK);
}
}
diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/OrderReturnOperationLogService.java b/oying-system/src/main/java/com/oying/modules/sh/service/OrderReturnOperationLogService.java
index 3b2f4fa..4e07023 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/service/OrderReturnOperationLogService.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/service/OrderReturnOperationLogService.java
@@ -56,4 +56,6 @@
* @throws IOException /
*/
void download(List<OrderReturnOperationLog> all, HttpServletResponse response) throws IOException;
+
+ List<OrderReturnOperationLog> getByReturnNum(String returnNum);
}
diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/OrderReturnService.java b/oying-system/src/main/java/com/oying/modules/sh/service/OrderReturnService.java
index bdab037..2aa81cf 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/service/OrderReturnService.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/service/OrderReturnService.java
@@ -7,6 +7,7 @@
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.oying.modules.sh.domain.request.AuditOrderReturn;
import com.oying.utils.PageResult;
/**
@@ -60,4 +61,6 @@
OrderReturn getByReturnNum(String outRefundNo);
void updatePayStatus(String outRefundNo, String status, String time);
+
+ void audit(AuditOrderReturn resources);
}
diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnOperationLogServiceImpl.java b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnOperationLogServiceImpl.java
index 813fca8..845ff10 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnOperationLogServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnOperationLogServiceImpl.java
@@ -11,12 +11,11 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.oying.utils.PageUtil;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
+
import com.oying.utils.PageResult;
/**
@@ -41,6 +40,11 @@
}
@Override
+ public List<OrderReturnOperationLog> getByReturnNum(String returnNum) {
+ return orderReturnOperationLogMapper.getByReturnNum(returnNum);
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public void create(OrderReturnOperationLog resources) {
orderReturnOperationLogMapper.insert(resources);
diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java
index 1c7ced3..3ad516b 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java
@@ -1,6 +1,7 @@
package com.oying.modules.sh.service.impl;
import com.oying.modules.sh.domain.OrderReturn;
+import com.oying.modules.sh.domain.request.AuditOrderReturn;
import com.oying.utils.FileUtil;
import com.oying.utils.enums.ReturnAuditEnum;
import lombok.RequiredArgsConstructor;
@@ -69,6 +70,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ public void audit(AuditOrderReturn resources) {
+
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public void deleteAll(List<Long> ids) {
orderReturnMapper.deleteBatchIds(ids);
}
diff --git a/oying-system/src/main/resources/mapper/sh/OrderReturnOperationLogMapper.xml b/oying-system/src/main/resources/mapper/sh/OrderReturnOperationLogMapper.xml
index e4e8859..8b47565 100644
--- a/oying-system/src/main/resources/mapper/sh/OrderReturnOperationLogMapper.xml
+++ b/oying-system/src/main/resources/mapper/sh/OrderReturnOperationLogMapper.xml
@@ -37,4 +37,11 @@
</where>
order by log_id desc
</select>
-</mapper>
\ No newline at end of file
+ <select id="getByReturnNum" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"/>
+ from sh_order_return_operation_log
+ where return_num = #{returnNum}
+ order by log_id desc
+ </select>
+</mapper>
--
Gitblit v1.9.3