[fix]给app提供商品接口

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<Vlog> pageParam = new Page<>(current, size);
         LambdaQueryWrapper<Vlog> 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<Vlog> vlogPage = vlogMapper.selectPage(pageParam, queryWrapper);
         List<Vlog> vlogList = vlogPage.getRecords();
         // TODO: 组装PagedGridResult返回

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<Page<ProductCategoryVO>> list(@RequestBody ProductCategoryBo query, Page<ProductCategory> page) {
+    @PostMapping("page")
+    public R<Page<ProductCategoryVO>> page(@RequestBody ProductCategoryBo query, Page<ProductCategory> page) {
         Page<ProductCategory> productCategoryPage = service.page(page,query.toWrapper());
         return R.ok(convert.toVO(productCategoryPage));
     }
 
+    @Tag(name ="查询商品分类列表")
+    @PostMapping("list")
+    public R<List<ProductCategoryVO>> list(@RequestBody ProductCategoryBo query) {
+        List<ProductCategory> productCategoryList = service.list(query.toWrapper());
+        return R.ok(convert.toVO(productCategoryList));
+    }
+
     @Tag(name ="获取商品分类详细信息")
     @GetMapping(value = "/{id}")
     public R getInfo(@PathVariable("id") Long id) {

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<IPage<ProductVO>> recommend(@RequestBody  Page<Product> page) {
+        return R.ok(productService.getRecommendPage(page));
+    }
 
 }

ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/ProductService.java

@@ -11,4 +11,11 @@ public interface ProductService extends IService<Product> {
 
     IPage<ProductVO> getList(ProductBo query, Page<Product> page);
 
+    /**
+     * 获取推荐商品列表
+     * @param page
+     * @return
+     */
+    IPage<ProductVO> getRecommendPage( Page<Product> page);
+
 }

ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductServiceImpl.java

@@ -28,7 +28,17 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
     public IPage<ProductVO> getList(ProductBo query, Page<Product> page) {
         return productMapper.getlist(page,query);
     }
-    public Product audit(Long id, Integer authFlag,String reasons) {
+
+
+    @Override
+    public IPage<ProductVO> getRecommendPage( Page<Product> 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("商品不存在");

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<MemberVO> getLoinInfo() {
+        return R.ok(service.getLoginMemberInfo());
+    }
+
 }

ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IMemberService.java

@@ -64,4 +64,7 @@ public interface IMemberService extends IService<Member> {
 
 
      MemberVO getMemberInfo(Serializable id);
+
+
+     MemberVO  getLoginMemberInfo();
 }

ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java

@@ -262,4 +262,11 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper,Member> implemen
     public MemberVO getMemberInfo(Serializable id) {
         return memberConvert.toVO(getById(id));
     }
+
+
+    @Override
+    public MemberVO getLoginMemberInfo() {
+        LoginUser tokenUser = LoginHelper.getLoginUser();
+        return this.getMemberInfo(tokenUser.getUserId());
+    }
 }