From f1eaef68ae52bb1dd1eb2cdd2772d806823629ec Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 02 Jul 2025 15:47:27 +0800
Subject: [PATCH] 退货原因表
---
oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderReturnReasonQueryCriteria.java | 4 ++
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnReasonServiceImpl.java | 27 ++++++++-----
oying-system/src/main/java/com/oying/modules/sh/mapper/OrderReturnReasonMapper.java | 2 +
oying-system/src/main/java/com/oying/modules/sh/service/OrderReturnReasonService.java | 8 +++
oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnReasonController.java | 6 +++
oying-system/src/main/resources/mapper/sh/OrderReturnReasonMapper.xml | 14 ++++++-
6 files changed, 47 insertions(+), 14 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderReturnReasonQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderReturnReasonQueryCriteria.java
index 2c43b09..9f0ed5f 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderReturnReasonQueryCriteria.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderReturnReasonQueryCriteria.java
@@ -18,7 +18,11 @@
@ApiModelProperty(value = "每页数据量", example = "10")
private Integer size = 10;
+ @ApiModelProperty(value = "退货类型")
+ private String reasonName;
+
@ApiModelProperty(value = "状态：0->不启用；1->启用")
private String reasonStatus;
+
private List<Timestamp> createTime;
}
diff --git a/oying-system/src/main/java/com/oying/modules/sh/mapper/OrderReturnReasonMapper.java b/oying-system/src/main/java/com/oying/modules/sh/mapper/OrderReturnReasonMapper.java
index a6fdf25..b105b39 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/mapper/OrderReturnReasonMapper.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/mapper/OrderReturnReasonMapper.java
@@ -19,4 +19,6 @@
IPage<OrderReturnReason> findAll(@Param("criteria") OrderReturnReasonQueryCriteria criteria, Page<Object> page);
List<OrderReturnReason> findAll(@Param("criteria") OrderReturnReasonQueryCriteria criteria);
+
+ List<OrderReturnReason> miniQuery();
}
diff --git a/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnReasonController.java b/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnReasonController.java
index e15ecc5..54167e0 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnReasonController.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnReasonController.java
@@ -48,6 +48,12 @@
return new ResponseEntity<>(R.success(orderReturnReasonService.queryAll(criteria, page)), HttpStatus.OK);
}
+ @GetMapping("mini")
+ @ApiOperation("小程序：查询退货原因表")
+ public ResponseEntity<Object> miniQuery() {
+ return new ResponseEntity<>(R.success(orderReturnReasonService.miniQuery()), HttpStatus.OK);
+ }
+
@PostMapping
@Log("新增退货原因表")
@ApiOperation("新增退货原因表")
diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/OrderReturnReasonService.java b/oying-system/src/main/java/com/oying/modules/sh/service/OrderReturnReasonService.java
index 5386abd..7218c41 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/service/OrderReturnReasonService.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/service/OrderReturnReasonService.java
@@ -26,9 +26,15 @@
/**
* 查询所有数据不分页
- * @param criteria 条件参数
* @return List<OrderReturnReasonDto>
*/
+ List<OrderReturnReason> miniQuery();
+
+ /**
+ * 小程序：查询所有数据不分页
+ * @param criteria 条件参数
+ * @return List<OrderReturnReasonDto>
+ */
List<OrderReturnReason> queryAll(OrderReturnReasonQueryCriteria criteria);
/**
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..5318bb5 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
@@ -2,6 +2,7 @@
import com.oying.modules.sh.domain.OrderReturnReason;
import com.oying.utils.FileUtil;
+import com.oying.utils.enums.StatusEnum;
import lombok.RequiredArgsConstructor;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -11,19 +12,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 +31,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 +72,7 @@
Map<String, Object> map = new LinkedHashMap<>();
map.put("退货类型", orderReturnReason.getReasonName());
map.put("排序", orderReturnReason.getSort());
- map.put("状态：0->不启用；1->启用", orderReturnReason.getReasonStatus());
+ map.put("状态", StatusEnum.getValue(orderReturnReason.getReasonStatus()));
map.put("创建者", orderReturnReason.getCreateBy());
map.put("更新者", orderReturnReason.getUpdateBy());
map.put("创建日期", orderReturnReason.getCreateTime());
diff --git a/oying-system/src/main/resources/mapper/sh/OrderReturnReasonMapper.xml b/oying-system/src/main/resources/mapper/sh/OrderReturnReasonMapper.xml
index 8103bd8..632ecee 100644
--- a/oying-system/src/main/resources/mapper/sh/OrderReturnReasonMapper.xml
+++ b/oying-system/src/main/resources/mapper/sh/OrderReturnReasonMapper.xml
@@ -24,10 +24,20 @@
<if test="criteria.reasonStatus != null">
and reason_status = #{criteria.reasonStatus}
</if>
+ <if test="criteria.reasonName != null">
+ and reason_name like concat('%',#{criteria.reasonName},'%')
+ </if>
<if test="criteria.createTime != null and criteria.createTime.size() > 0">
AND create_time BETWEEN #{criteria.createTime[0]} AND #{criteria.createTime[1]}
</if>
</where>
- order by reason_id desc
+ order by sort desc
</select>
-</mapper>
\ No newline at end of file
+ <select id="miniQuery" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"/>
+ from sh_order_return_reason
+ where reason_status = '1'
+ order by sort desc
+ </select>
+</mapper>
--
Gitblit v1.9.3