From 17e7cde3be486d840887de6ecb9a8b05486e19aa Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 23 Jun 2026 10:19:44 +0800
Subject: [PATCH] feat(admin): 优化国家运费配置管理功能
---
src/main/java/cc/mrbird/febs/mall/service/IMallCountryDeliveryService.java | 5 +++++
src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java | 13 +++++++++----
src/main/java/cc/mrbird/febs/mall/mapper/MallCountryDeliveryMapper.java | 4 ++++
src/main/java/cc/mrbird/febs/mall/service/impl/MallCountryDeliveryServiceImpl.java | 11 +++++++++++
src/main/resources/mapper/modules/MallCountryDeliveryMapper.xml | 9 +++++++++
5 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
index fadf604..7432165 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
@@ -1,11 +1,15 @@
package cc.mrbird.febs.mall.controller;
import cc.mrbird.febs.common.annotation.ControllerEndpoint;
+import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsResponse;
+import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
+import cc.mrbird.febs.mall.entity.MallCountryDelivery;
+import cc.mrbird.febs.mall.entity.MallNewsInfo;
import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.mall.service.ICommonService;
import cc.mrbird.febs.mall.service.IMallCountryDeliveryService;
@@ -45,7 +49,7 @@
@RestController
@RequiredArgsConstructor
@RequestMapping(value = "/admin/system")
-public class AdminSystemController {
+public class AdminSystemController extends BaseController {
@Autowired
private ISystemService systemService;
@@ -130,9 +134,10 @@
return new FebsResponse().success().message("保存成功");
}
- @GetMapping(value = "/countryDeliveryList")
- public FebsResponse countryDeliveryList() {
- return countryDeliveryService.list();
+ @GetMapping("countryDeliveryList")
+ public FebsResponse countryDeliveryList(MallCountryDelivery dto, QueryRequest request) {
+ Map<String, Object> data = getDataTable(countryDeliveryService.countryDeliveryList(dto, request));
+ return new FebsResponse().success().data(data);
}
@PostMapping(value = "/countryDeliverySave")
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallCountryDeliveryMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallCountryDeliveryMapper.java
index bbd96e7..1c14a0e 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallCountryDeliveryMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallCountryDeliveryMapper.java
@@ -2,6 +2,8 @@
import cc.mrbird.febs.mall.entity.MallCountryDelivery;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
/**
* 国家运费配置 Mapper
@@ -9,4 +11,6 @@
* @author auto-generated
*/
public interface MallCountryDeliveryMapper extends BaseMapper<MallCountryDelivery> {
+
+ IPage<MallCountryDelivery> getCountryDeliveryListInPage(Page<MallCountryDelivery> page, MallCountryDelivery dto);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IMallCountryDeliveryService.java b/src/main/java/cc/mrbird/febs/mall/service/IMallCountryDeliveryService.java
index 59ba084..dcd9bf4 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IMallCountryDeliveryService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IMallCountryDeliveryService.java
@@ -1,7 +1,10 @@
package cc.mrbird.febs.mall.service;
import cc.mrbird.febs.common.entity.FebsResponse;
+import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.dto.CountryDeliveryDto;
+import cc.mrbird.febs.mall.entity.MallCountryDelivery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
/**
* 国家运费配置 Service 接口
@@ -13,6 +16,8 @@
/** 列表查询 */
FebsResponse list();
+ IPage<MallCountryDelivery> countryDeliveryList(MallCountryDelivery dto, QueryRequest request);
+
/** 新增/更新 */
FebsResponse saveOrUpdate(CountryDeliveryDto dto);
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MallCountryDeliveryServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MallCountryDeliveryServiceImpl.java
index 0ee3bd1..b53a90a 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MallCountryDeliveryServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MallCountryDeliveryServiceImpl.java
@@ -1,12 +1,16 @@
package cc.mrbird.febs.mall.service.impl;
import cc.mrbird.febs.common.entity.FebsResponse;
+import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.dto.CountryDeliveryDto;
import cc.mrbird.febs.mall.entity.MallCountryDelivery;
import cc.mrbird.febs.mall.mapper.MallCountryDeliveryMapper;
import cc.mrbird.febs.mall.service.IMallCountryDeliveryService;
+import cc.mrbird.febs.mall.vo.AdminMallNewsInfoVo;
import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -36,6 +40,13 @@
}
@Override
+ public IPage<MallCountryDelivery> countryDeliveryList(MallCountryDelivery dto, QueryRequest request) {
+ Page<MallCountryDelivery> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<MallCountryDelivery> pages = mallCountryDeliveryMapper.getCountryDeliveryListInPage(page, dto);
+ return pages;
+ }
+
+ @Override
public FebsResponse saveOrUpdate(CountryDeliveryDto dto) {
MallCountryDelivery entity = new MallCountryDelivery();
entity.setCountryCode(dto.getCountryCode().toUpperCase());
diff --git a/src/main/resources/mapper/modules/MallCountryDeliveryMapper.xml b/src/main/resources/mapper/modules/MallCountryDeliveryMapper.xml
index 516ff3a..50ed41b 100644
--- a/src/main/resources/mapper/modules/MallCountryDeliveryMapper.xml
+++ b/src/main/resources/mapper/modules/MallCountryDeliveryMapper.xml
@@ -16,4 +16,13 @@
<result column="REMARK" jdbcType="VARCHAR" property="remark"/>
</resultMap>
+
+
+ <select id="getCountryDeliveryListInPage" resultType="cc.mrbird.febs.mall.entity.MallCountryDelivery">
+ SELECT
+ a.*
+ FROM mall_country_delivery a
+ order by a.CREATED_TIME desc
+ </select>
+
</mapper>
--
Gitblit v1.9.1