From 69afee5eb5829ad9dc33ca9defaf73a495dfe2ef Mon Sep 17 00:00:00 2001 From: SUCH HAVE YOU <2207141659@qq.com> Date: Sat, 21 Sep 2024 19:26:49 +0800 Subject: [PATCH] =?UTF-8?q?feat.=E4=BC=98=E5=8C=96=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ShopMemberLevelController.java | 12 +++++------ .../dao/ShopMemberLevelDao.java | 4 ++-- .../entity/ShopMemberLevel.java | 4 +--- .../service/ShopMemberLevelService.java | 4 ++-- .../impl/ShopMemberLevelServiceImpl.java | 20 ++++++++++++------- 5 files changed, 24 insertions(+), 20 deletions(-) rename skyeye-shop/shop-store/src/main/java/com/skyeye/{member_level => level}/controller/ShopMemberLevelController.java (89%) rename skyeye-shop/shop-store/src/main/java/com/skyeye/{member_level => level}/dao/ShopMemberLevelDao.java (58%) rename skyeye-shop/shop-store/src/main/java/com/skyeye/{member_level => level}/entity/ShopMemberLevel.java (92%) rename skyeye-shop/shop-store/src/main/java/com/skyeye/{member_level => level}/service/ShopMemberLevelService.java (81%) rename skyeye-shop/shop-store/src/main/java/com/skyeye/{member_level => level}/service/impl/ShopMemberLevelServiceImpl.java (81%) diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/member_level/controller/ShopMemberLevelController.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/level/controller/ShopMemberLevelController.java similarity index 89% rename from skyeye-shop/shop-store/src/main/java/com/skyeye/member_level/controller/ShopMemberLevelController.java rename to skyeye-shop/shop-store/src/main/java/com/skyeye/level/controller/ShopMemberLevelController.java index 0acaadad..5d2ec8b3 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/member_level/controller/ShopMemberLevelController.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/level/controller/ShopMemberLevelController.java @@ -1,4 +1,4 @@ -package com.skyeye.member_level.controller; +package com.skyeye.level.controller; import com.skyeye.annotation.api.Api; @@ -8,8 +8,8 @@ import com.skyeye.annotation.api.ApiOperation; import com.skyeye.common.entity.search.CommonPageInfo; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; -import com.skyeye.member_level.entity.ShopMemberLevel; -import com.skyeye.member_level.service.ShopMemberLevelService; +import com.skyeye.level.entity.ShopMemberLevel; +import com.skyeye.level.service.ShopMemberLevelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -45,13 +45,13 @@ public class ShopMemberLevelController { @ApiOperation(id = "getMemberLevel", value = "根据ID获取会员等级", method = "GET", allUse = "2") @ApiImplicitParams({@ApiImplicitParam(id = "id", name = "id", value = "主键id", required = "required")}) - @RequestMapping("/post/ShopStoreController/getMemberLevel") + @RequestMapping("/post/ShopMemberLevelController/getMemberLevel") public void queryStoreByIds(InputObject inputObject, OutputObject outputObject) { shopMemberLevelService.selectById(inputObject, outputObject); } - @ApiOperation(id = "memberLevel-list-all-simple",value = "获取精简的会员等级信息，主要用于下拉列表",method = "GET",allUse = "2") - @RequestMapping("/post/ShopMemberLevelController/memberLevel-list-all-simple") + @ApiOperation(id = "memberLevelListAllSimple",value = "获取精简的会员等级信息，主要用于下拉列表",method = "GET",allUse = "2") + @RequestMapping("/post/ShopMemberLevelController/memberLevelListAllSimple") public void streamlineMemberLevelList(InputObject inputObject, OutputObject outputObject) { shopMemberLevelService.streamlineMemberLevelList(inputObject,outputObject); } diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/member_level/dao/ShopMemberLevelDao.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/level/dao/ShopMemberLevelDao.java similarity index 58% rename from skyeye-shop/shop-store/src/main/java/com/skyeye/member_level/dao/ShopMemberLevelDao.java rename to skyeye-shop/shop-store/src/main/java/com/skyeye/level/dao/ShopMemberLevelDao.java index 56bd351d..48aafda3 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/member_level/dao/ShopMemberLevelDao.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/level/dao/ShopMemberLevelDao.java @@ -1,7 +1,7 @@ -package com.skyeye.member_level.dao; +package com.skyeye.level.dao; import com.skyeye.eve.dao.SkyeyeBaseMapper; -import com.skyeye.member_level.entity.ShopMemberLevel; +import com.skyeye.level.entity.ShopMemberLevel; public interface ShopMemberLevelDao extends SkyeyeBaseMapper { diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/member_level/entity/ShopMemberLevel.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/level/entity/ShopMemberLevel.java similarity index 92% rename from skyeye-shop/shop-store/src/main/java/com/skyeye/member_level/entity/ShopMemberLevel.java rename to skyeye-shop/shop-store/src/main/java/com/skyeye/level/entity/ShopMemberLevel.java index 5f8489da..6eb02186 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/member_level/entity/ShopMemberLevel.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/level/entity/ShopMemberLevel.java @@ -1,14 +1,12 @@ -package com.skyeye.member_level.entity; +package com.skyeye.level.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.skyeye.annotation.api.ApiModel; import com.skyeye.annotation.api.ApiModelProperty; -import com.skyeye.annotation.cache.RedisCacheField; import com.skyeye.annotation.unique.UniqueField; -import com.skyeye.common.constans.CacheConstants; import com.skyeye.common.entity.features.OperatorUserInfo; import lombok.Data; diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/member_level/service/ShopMemberLevelService.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/level/service/ShopMemberLevelService.java similarity index 81% rename from skyeye-shop/shop-store/src/main/java/com/skyeye/member_level/service/ShopMemberLevelService.java rename to skyeye-shop/shop-store/src/main/java/com/skyeye/level/service/ShopMemberLevelService.java index 82ebc9b8..449bff49 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/member_level/service/ShopMemberLevelService.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/level/service/ShopMemberLevelService.java @@ -1,10 +1,10 @@ -package com.skyeye.member_level.service; +package com.skyeye.level.service; import com.skyeye.base.business.service.SkyeyeBusinessService; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; -import com.skyeye.member_level.entity.ShopMemberLevel; +import com.skyeye.level.entity.ShopMemberLevel; public interface ShopMemberLevelService extends SkyeyeBusinessService { diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/member_level/service/impl/ShopMemberLevelServiceImpl.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/level/service/impl/ShopMemberLevelServiceImpl.java similarity index 81% rename from skyeye-shop/shop-store/src/main/java/com/skyeye/member_level/service/impl/ShopMemberLevelServiceImpl.java rename to skyeye-shop/shop-store/src/main/java/com/skyeye/level/service/impl/ShopMemberLevelServiceImpl.java index 59ae05fb..db835574 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/member_level/service/impl/ShopMemberLevelServiceImpl.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/level/service/impl/ShopMemberLevelServiceImpl.java @@ -1,4 +1,4 @@ -package com.skyeye.member_level.service.impl; +package com.skyeye.level.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -7,10 +7,9 @@ import com.skyeye.base.business.service.impl.SkyeyeBusinessServiceImpl; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; import com.skyeye.common.util.mybatisplus.MybatisPlusUtil; -import com.skyeye.member_level.dao.ShopMemberLevelDao; -import com.skyeye.member_level.entity.ShopMemberLevel; -import com.skyeye.member_level.service.ShopMemberLevelService; -import com.skyeye.store.entity.ShopStore; +import com.skyeye.level.dao.ShopMemberLevelDao; +import com.skyeye.level.entity.ShopMemberLevel; +import com.skyeye.level.service.ShopMemberLevelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,10 +32,12 @@ public class ShopMemberLevelServiceImpl extends SkyeyeBusinessServiceImpl queryWrapper = new QueryWrapper<>(); // 添加查询条件 enabled = "2" - queryWrapper.eq("enabled", "2"); - List list = shopMemberLevelDao.selectList(queryWrapper); + queryWrapper.eq(MybatisPlusUtil.toColumns(ShopMemberLevel::getEnabled), "2"); + //查询 + List list = list(queryWrapper); outputObject.setBeans(list); outputObject.settotal(list.size()); } @@ -50,14 +51,19 @@ public class ShopMemberLevelServiceImpl extends SkyeyeBusinessServiceImpl map = inputObject.getParams(); QueryWrapper queryWrapper = new QueryWrapper<>(); + //获取name值 String nameValue = map.get("name").toString(); + //判断name值是否存在，添加查询条件 if (StrUtil.isNotEmpty(nameValue)) { queryWrapper.eq(MybatisPlusUtil.toColumns(ShopMemberLevel::getName), nameValue); } + //获取name值 String enabledValue = map.get("enabled").toString(); + //判断enabled值是否存在，添加查询条件 if (StrUtil.isNotEmpty(enabledValue)) { queryWrapper.eq(MybatisPlusUtil.toColumns(ShopMemberLevel::getEnabled), enabledValue); } + //查询 List memberLevels = shopMemberLevelDao.selectList(queryWrapper); outputObject.setBeans(memberLevels); outputObject.settotal(memberLevels.size());