From 7ece553fd95f30dcfafa66f667ef9d0c064a22e6 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Sat, 19 Jul 2025 16:27:12 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnReasonServiceImpl.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnReasonServiceImpl.java b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnReasonServiceImpl.java
index 27e64e3..8225f3c 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnReasonServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnReasonServiceImpl.java
@@ -11,19 +11,18 @@
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;
/**
-* @description 服务实现
-* @author lixin
-* @date 2025-06-11
-**/
+ * @author lixin
+ * @description 服务实现
+ * @date 2025-06-11
+ **/
@Service
@RequiredArgsConstructor
public class OrderReturnReasonServiceImpl extends ServiceImpl<OrderReturnReasonMapper, OrderReturnReason> implements OrderReturnReasonService {
@@ -31,13 +30,18 @@
private final OrderReturnReasonMapper orderReturnReasonMapper;
@Override
- public PageResult<OrderReturnReason> queryAll(OrderReturnReasonQueryCriteria criteria, Page<Object> page){
+ public PageResult<OrderReturnReason> queryAll(OrderReturnReasonQueryCriteria criteria, Page<Object> page) {
return PageUtil.toPage(orderReturnReasonMapper.findAll(criteria, page));
}
@Override
- public List<OrderReturnReason> queryAll(OrderReturnReasonQueryCriteria criteria){
+ public List<OrderReturnReason> queryAll(OrderReturnReasonQueryCriteria criteria) {
return orderReturnReasonMapper.findAll(criteria);
+ }
+
+ @Override
+ public List<OrderReturnReason> miniQuery() {
+ return orderReturnReasonMapper.miniQuery();
}
@Override
@@ -67,7 +71,7 @@
Map<String, Object> map = new LinkedHashMap<>();
map.put("退货类型", orderReturnReason.getReasonName());
map.put("排序", orderReturnReason.getSort());
- map.put("状态：0->不启用；1->启用", orderReturnReason.getReasonStatus());
+ map.put("状态", orderReturnReason.getReasonStatus() ? "启用" : "停用");
map.put("创建者", orderReturnReason.getCreateBy());
map.put("更新者", orderReturnReason.getUpdateBy());
map.put("创建日期", orderReturnReason.getCreateTime());
--
Gitblit v1.9.3