From 28977e5313598a363993a7f61344aa641673e77c Mon Sep 17 00:00:00 2001 From: wangqx Date: Mon, 28 Jul 2025 15:58:14 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E7=BB=99app=E6=8F=90=E4=BE=9B=E5=95=86?= =?UTF-8?q?=E5=93=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../content/service/impl/VlogServiceImpl.java | 13 +++++++++++-- .../goods/controller/ProductCategoryController.java | 13 +++++++++++-- .../soopin/goods/controller/ProductController.java | 5 +++++ .../wzj/soopin/goods/service/ProductService.java | 7 +++++++ .../goods/service/impl/ProductServiceImpl.java | 12 +++++++++++- .../soopin/member/controller/MemberController.java | 7 +++++++ .../wzj/soopin/member/service/IMemberService.java | 3 +++ .../member/service/impl/MemberServiceImpl.java | 7 +++++++ 8 files changed, 62 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java index d4b932928..179af604c 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java @@ -32,6 +32,8 @@ import com.wzj.soopin.content.utils.TencentCloudUtil; import com.wzj.soopin.member.service.IFansService; import com.wzj.soopin.content.convert.VlogConvert; import org.apache.commons.lang3.StringUtils; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.satoken.utils.LoginHelper; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -291,8 +293,15 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { int size = (int) page.getSize(); Page pageParam = new Page<>(current, size); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(Vlog::getVlogerId, bo.getUserId()) - .eq(Vlog::getIsPrivate, bo.getYesOrNo()); + + if(bo.getUserId()==null){ + LoginUser user= LoginHelper.getLoginUser(); + queryWrapper.eq(Vlog::getVlogerId, user.getUserId()); + }else{ + queryWrapper.eq(Vlog::getVlogerId, bo.getUserId()); + + } + queryWrapper.eq(Vlog::getIsPrivate, bo.getYesOrNo()); Page vlogPage = vlogMapper.selectPage(pageParam, queryWrapper); List vlogList = vlogPage.getRecords(); // TODO: 组装PagedGridResult返回 diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductCategoryController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductCategoryController.java index 75b44fcac..c759a2861 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductCategoryController.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductCategoryController.java @@ -14,6 +14,8 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.web.core.BaseController; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 商品分类Controller @@ -31,12 +33,19 @@ public class ProductCategoryController extends BaseController { private final ProductCategoryConvert convert; @Tag(name ="查询商品分类列表") - @PostMapping("list") - public R> list(@RequestBody ProductCategoryBo query, Page page) { + @PostMapping("page") + public R> page(@RequestBody ProductCategoryBo query, Page page) { Page productCategoryPage = service.page(page,query.toWrapper()); return R.ok(convert.toVO(productCategoryPage)); } + @Tag(name ="查询商品分类列表") + @PostMapping("list") + public R> list(@RequestBody ProductCategoryBo query) { + List productCategoryList = service.list(query.toWrapper()); + return R.ok(convert.toVO(productCategoryList)); + } + @Tag(name ="获取商品分类详细信息") @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") Long id) { diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java index fb497e1aa..99c5a31bd 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java @@ -96,5 +96,10 @@ public class ProductController extends BaseController { @RequestParam Integer publishStatus) { return R.ok(service.publish(id,publishStatus)); } + @Tag(name ="查询商品信息列表") + @PostMapping("/recommend") + public R> recommend(@RequestBody Page page) { + return R.ok(productService.getRecommendPage(page)); + } } 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 1c8d4e0bf..e45a5288a 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 @@ -11,4 +11,11 @@ public interface ProductService extends IService { IPage getList(ProductBo query, Page page); + /** + * 获取推荐商品列表 + * @param page + * @return + */ + IPage getRecommendPage( Page page); + } 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 049e6156e..fcb69b3d4 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 @@ -28,7 +28,17 @@ public class ProductServiceImpl extends ServiceImpl impl public IPage getList(ProductBo query, Page page) { return productMapper.getlist(page,query); } - public Product audit(Long id, Integer authFlag,String reasons) { + + + @Override + public IPage getRecommendPage( Page page) { + + //推荐商品要根据算法获取 + + return productMapper.getlist(page,new ProductBo()); + } + + public Product audit(Long id, Integer authFlag, String reasons) { Product productToUpdate = productMapper.selectById(id); if (productToUpdate == null) { throw new RuntimeException("商品不存在"); diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberController.java index e35e45fe0..6b7ad42de 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberController.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberController.java @@ -233,4 +233,11 @@ public class MemberController extends BaseController { return null; } + + @Tag(name ="获取登录会员的信息") + @GetMapping(value = "/login/info") + public R getLoinInfo() { + return R.ok(service.getLoginMemberInfo()); + } + } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IMemberService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IMemberService.java index 28c630e1a..3646b39f1 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IMemberService.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IMemberService.java @@ -64,4 +64,7 @@ public interface IMemberService extends IService { MemberVO getMemberInfo(Serializable id); + + + MemberVO getLoginMemberInfo(); } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java index 91626518d..f9a85b3be 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java @@ -262,4 +262,11 @@ public class MemberServiceImpl extends ServiceImpl implemen public MemberVO getMemberInfo(Serializable id) { return memberConvert.toVO(getById(id)); } + + + @Override + public MemberVO getLoginMemberInfo() { + LoginUser tokenUser = LoginHelper.getLoginUser(); + return this.getMemberInfo(tokenUser.getUserId()); + } }