From 85dbab8f222168cf86c513a3efbb4b7c047465da Mon Sep 17 00:00:00 2001 From: huk Date: Fri, 10 Oct 2025 14:47:45 +0800 Subject: [PATCH] =?UTF-8?q?refactor(goods):=E4=BC=98=E5=8C=96=E5=95=86?= =?UTF-8?q?=E5=93=81=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=E5=B9=B6=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=9D=83=E9=99=90=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了 AppProductController 中不必要的具体实现类引用 - 修改了商品查询方法名，统一为 getProduct - 在 AppSearchController 中更新了商品查询调用 -为 AppVlogController 的 indexList 方法添加了 @SaIgnore 注解 -优化了 ProductMapper.xml 中的查询条件，增加租户状态过滤 - 格式化了 Java 代码中的空格和括号问题 - 移除了冗余的注释和无用的方法定义 --- .../org/dromara/app/AppProductController.java | 5 +--- .../org/dromara/app/AppSearchController.java | 2 +- .../org/dromara/app/AppVlogController.java | 12 ++++---- .../soopin/goods/mapper/ProductMapper.java | 1 - .../soopin/goods/service/ProductService.java | 11 ++------ .../service/impl/ProductServiceImpl.java | 13 --------- .../resources/mapper/goods/ProductMapper.xml | 28 +++++++++---------- 7 files changed, 24 insertions(+), 48 deletions(-) diff --git a/ruoyi-admin/src/main/java/org/dromara/app/AppProductController.java b/ruoyi-admin/src/main/java/org/dromara/app/AppProductController.java index e1feeb1e0..d0f4d4a3b 100644 --- a/ruoyi-admin/src/main/java/org/dromara/app/AppProductController.java +++ b/ruoyi-admin/src/main/java/org/dromara/app/AppProductController.java @@ -1,13 +1,10 @@ package org.dromara.app; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wzj.soopin.goods.convert.ProductConvert; import com.wzj.soopin.goods.domain.bo.ProductBo; -import com.wzj.soopin.goods.domain.entity.Product; import com.wzj.soopin.goods.domain.vo.ProductVO; import com.wzj.soopin.goods.service.ProductService; -import com.wzj.soopin.goods.service.impl.ProductServiceImpl; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -20,7 +17,7 @@ import org.springframework.web.bind.annotation.*; @RequiredArgsConstructor public class AppProductController { - private final ProductServiceImpl service; + private final ProductService service; private final ProductConvert convert; private final ProductService productService; diff --git a/ruoyi-admin/src/main/java/org/dromara/app/AppSearchController.java b/ruoyi-admin/src/main/java/org/dromara/app/AppSearchController.java index 76432a5a7..2fe3e8d35 100644 --- a/ruoyi-admin/src/main/java/org/dromara/app/AppSearchController.java +++ b/ruoyi-admin/src/main/java/org/dromara/app/AppSearchController.java @@ -59,7 +59,7 @@ public class AppSearchController { } else if (Objects.nonNull(searchBO) && Objects.nonNull(searchBO.getType()) && (SearchTypeEnum.PRODUCT.type.intValue() == searchBO.getType().intValue())) { ProductBo productBo = new ProductBo(); productBo.setNameLike(searchBO.getTitle()); - pages = productService.getProductPageList(productBo, page); + pages = productService.getProduct(page, productBo); // 用户检索信息 } else if (Objects.nonNull(searchBO) && Objects.nonNull(searchBO.getType()) && (SearchTypeEnum.MEMBER.type.intValue() == searchBO.getType().intValue())) { MemberBO memberBO = new MemberBO(); diff --git a/ruoyi-admin/src/main/java/org/dromara/app/AppVlogController.java b/ruoyi-admin/src/main/java/org/dromara/app/AppVlogController.java index d59b9feac..5c43d15b1 100644 --- a/ruoyi-admin/src/main/java/org/dromara/app/AppVlogController.java +++ b/ruoyi-admin/src/main/java/org/dromara/app/AppVlogController.java @@ -1,5 +1,6 @@ package org.dromara.app; +import cn.dev33.satoken.annotation.SaIgnore; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wzj.soopin.content.domain.bo.*; import com.wzj.soopin.content.domain.vo.IndexVlogVO; @@ -36,8 +37,8 @@ public class AppVlogController { @Operation(summary = "首页视频列表") @PostMapping("/indexList") + @SaIgnore public R> indexList(@RequestBody IndexListBO bo, @RequestBody Page page) { - Page pages = pullService.pullFromMq(page); return R.ok(pages); } @@ -69,7 +70,7 @@ public class AppVlogController { public R> myPrivateList(@RequestBody MyListBO bo, @RequestBody Page page) { LoginUser loginUser = LoginHelper.getLoginUser(); if (loginUser == null) { - return R.notLogin(); + return R.notLogin(); } bo.setUserId(String.valueOf(loginUser.getUserId())); Page pages = vlogService.queryMyVlogList(bo, page); @@ -133,12 +134,11 @@ public class AppVlogController { String userId = String.valueOf(loginUser.getUserId()); String vlogId = vlogBO.getId(); - vlogService.userLikeVlog(userId,vlogId ); + vlogService.userLikeVlog(userId, vlogId); return R.ok(); } - @Operation(summary = "取消点赞") @PostMapping("/unlike") public R unlike(@RequestBody VlogBO vlogBO) { @@ -167,12 +167,12 @@ public class AppVlogController { @Operation(summary = "视频列表") @PostMapping("/page") public R> page(@RequestBody VlogBO vlogBO) { - if(vlogBO.getMemberId()==null){ + if (vlogBO.getMemberId() == null) { throw new ServiceException("用户id不能为空"); } vlogBO.setStatus(VlogStatusEnum.APPROVED.type); vlogBO.setIsPrivate(YesOrNo.NO.type); - return R.ok(vlogService.getIndexVlogList(vlogBO,vlogBO.getPage())); + return R.ok(vlogService.getIndexVlogList(vlogBO, vlogBO.getPage())); } diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/mapper/ProductMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/mapper/ProductMapper.java index 74b15c42e..19443b7dd 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/mapper/ProductMapper.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/mapper/ProductMapper.java @@ -25,7 +25,6 @@ public interface ProductMapper extends BaseMapper { Page getlist(@Param("page") Page page, @Param("query") ProductBo query); - @Select("SELECT " + "name, " + "sales, " + diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/ProductService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/ProductService.java index 8f4594886..2f4b4cd23 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/ProductService.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/ProductService.java @@ -13,14 +13,7 @@ public interface ProductService extends IService { IPage getRecommendPage(Page page); - /** - * 不带租户的获取商品信息 - * - * @param query - * @param page - * @return - */ - IPage getProductPageList(ProductBo query, Page page); - ProductVO selectById(Long id); + + IPage getProduct(Page page, ProductBo query); } diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductServiceImpl.java index 5c8fac5f5..37fa92fec 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductServiceImpl.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductServiceImpl.java @@ -98,17 +98,4 @@ public class ProductServiceImpl extends ServiceImpl impl query.setPublishStatus(Constants.PublishStatus.GROUNDING); return TenantHelper.ignore(() -> productMapper.getProduct(page, query)); } - - - /** - * 不带租户的获取商品信息 - * - * @param query - * @param page - * @return - */ - @Override - public IPage getProductPageList(ProductBo query, Page page) { - return TenantHelper.ignore(() -> productMapper.getProduct(page, query)); - } } diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml index 708f2094b..1083ac75e 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml +++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml @@ -86,20 +86,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pms_product p LEFT JOIN sys_tenant t ON p.tenant_id = t.tenant_id - - - AND p.name LIKE CONCAT('%', #{query.nameLike}, '%') - - - AND p.publish_status = #{query.publishStatus} - - - AND p.category_id IN - - #{categoryId} - - - + WHERE p.del_flag = 0 + AND t.status = 0 + + AND (p.`name` LIKE CONCAT('%', #{query.nameLike}, '%') OR t.store_name LIKE CONCAT('%', #{query.nameLike}, '%')) + + + AND p.publish_status = #{query.publishStatus} + + + AND p.category_id IN + + #{categoryId} + +