From 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 13:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java | 128 +++++++++---------------------------------
1 files changed, 28 insertions(+), 100 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java
index 726d81a..917248d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java
@@ -1,25 +1,15 @@
package com.ruoyi.system.controller.miniapp;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.member.domain.pojo.member.Member;
-import com.ruoyi.member.service.member.MemberService;
-import com.ruoyi.system.domain.dto.*;
import com.ruoyi.system.domain.vo.*;
-import com.ruoyi.system.service.config.AdvertService;
-import com.ruoyi.system.service.config.BannerService;
-import com.ruoyi.system.service.config.QuickEntryService;
-import com.ruoyi.system.service.goods.GoodsService;
-import com.ruoyi.system.service.shop.ShopService;
+import com.ruoyi.system.service.config.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -36,121 +26,59 @@
- @Autowired
+ @Resource
private BannerService bannerService;
- @Autowired
+ @Resource
private QuickEntryService quickEntryService;
- @Autowired
+ @Resource
private AdvertService advertService;
+ @Resource
+ private PopService popService;
- @RequestMapping(value = "/getNearbyShop", method = RequestMethod.POST)
- @ApiOperation(value = "获取最近商户")
- public R<AppNearbyShopVo> getNearbyShop(@RequestBody AppNearbyShopDto appNearbyShopDto) {
- Long userId = SecurityUtils.getUserId();
- appNearbyShopDto.setUserId(userId);
- AppNearbyShopVo appNearbyShopVo = memberService.getNearbyShop(appNearbyShopDto);
- return R.ok(appNearbyShopVo);
- }
+ @Resource
+ private BottomNavService bottomNavService;
+
+
+
@RequestMapping(value = "/getHomeBanner", method = RequestMethod.POST)
- @ApiOperation(value = "获取首页banner")
+ @ApiOperation(value = "获取首页banner【2.0】")
public R<List<AppBannerVo>> getHomeBanner() {
List<AppBannerVo> appBannerVoList = bannerService.listHomeBannerVo();
return R.ok(appBannerVoList);
}
-
+
@RequestMapping(value = "/getQuickEntry", method = RequestMethod.POST)
- @ApiOperation(value = "获取首页快速入口")
+ @ApiOperation(value = "获取首页快速入口【2.0】")
public R<List<AppQuickEntryVo>> getQuickEntry() {
List<AppQuickEntryVo> appQuickEntryVoList = quickEntryService.listQuickEntryVo();
return R.ok(appQuickEntryVoList);
}
-
+
@RequestMapping(value = "/getAdvert", method = RequestMethod.POST)
- @ApiOperation(value = "获取首页广告")
+ @ApiOperation(value = "获取首页广告【2.0】")
public R<AppAdvertVo> getAdvert() {
AppAdvertVo appAdvertVo = advertService.getAdvertVo();
return R.ok(appAdvertVo);
}
-
- @RequestMapping(value = "/pageRecommendGoods", method = RequestMethod.POST)
- @ApiOperation(value = "推荐商品")
- public R<Page<AppSimpleGoodsVo>> pageRecommendGoods(@RequestBody AppPageDto appPageDto) {
- Long userId = SecurityUtils.getUserId();
- Long shopId = null;
- if(userId!=null){
- Member member = memberService.getById(userId);
- if(member!=null&&member.getRealtionShopId()!=null){
- shopId = member.getRealtionShopId();
- }
- }
- Page<AppSimpleGoodsVo> page = new Page<>();
- page.setSize(appPageDto.getPageSize());
- page.setCurrent(appPageDto.getPageNum());
- List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageRecommendGoods(page,shopId);
- return R.ok(page.setRecords(appSimpleGoodsVoList));
+
+ @RequestMapping(value = "/getPop", method = RequestMethod.POST)
+ @ApiOperation(value = "获取弹窗【2.0】")
+ public R<AppPopVo> getAppPop() {
+ AppPopVo appPopVo = popService.getAppPop();
+ return R.ok(appPopVo);
}
- @RequestMapping(value = "/pageShopGoods", method = RequestMethod.POST)
- @ApiOperation(value = "商城商品")
- public R<Page<AppSimpleGoodsVo>> pageShopGoods(@RequestBody AppShopGoodsPageDto appShopGoodsPageDto) {
- Long userId = SecurityUtils.getUserId();
- if(userId!=null){
- Member member = memberService.getById(userId);
- if(member!=null&&member.getRealtionShopId()!=null){
- appShopGoodsPageDto.setShopId(member.getRealtionShopId());
- }
- }
- Page<AppSimpleGoodsVo> page = new Page<>();
- page.setSize(appShopGoodsPageDto.getPageSize());
- page.setCurrent(appShopGoodsPageDto.getPageNum());
- List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageShopGoods(page,appShopGoodsPageDto);
- return R.ok(page.setRecords(appSimpleGoodsVoList));
- }
- @RequestMapping(value = "/pageSearchGoods", method = RequestMethod.POST)
- @ApiOperation(value = "搜索商品")
- public R<Page<AppSimpleGoodsVo>> pageSearchGoods(@RequestBody AppSearchGoodsPageDto appSearchGoodsPageDto) {
- Long userId = SecurityUtils.getUserId();
- if(userId!=null){
- Member member = memberService.getById(userId);
- if(member!=null&&member.getRealtionShopId()!=null){
- appSearchGoodsPageDto.setShopId(member.getRealtionShopId());
- }
- }
- Page<AppSimpleGoodsVo> page = new Page<>();
- page.setSize(appSearchGoodsPageDto.getPageSize());
- page.setCurrent(appSearchGoodsPageDto.getPageNum());
- List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageSearchGoods(page,appSearchGoodsPageDto);
- return R.ok(page.setRecords(appSimpleGoodsVoList));
- }
- @RequestMapping(value = "/pageSearchActivityGoods", method = RequestMethod.POST)
- @ApiOperation(value = "搜索活动商品")
- public R<Page<AppSimpleActivityGoodsVo>> pageSearchActivityGoods(@RequestBody AppSearchGoodsPageDto appSearchGoodsPageDto) {
- Long userId = SecurityUtils.getUserId();
- if(userId!=null){
- Member member = memberService.getById(userId);
- if(member!=null&&member.getRealtionShopId()!=null){
- appSearchGoodsPageDto.setShopId(member.getRealtionShopId());
- }
- }
- Page<AppSimpleActivityGoodsVo> page = new Page<>();
- page.setSize(appSearchGoodsPageDto.getPageSize());
- page.setCurrent(appSearchGoodsPageDto.getPageNum());
- List<AppSimpleActivityGoodsVo> appSimpleGoodsVoList = goodsService.pageSearchActivityGoods(page,appSearchGoodsPageDto);
- return R.ok(page.setRecords(appSimpleGoodsVoList));
+ @RequestMapping(value = "/getBottomNav", method = RequestMethod.GET)
+ @ApiOperation(value = "获取底部导航栏")
+ public R<List<AppBottomNavVO>> getBottomNav() {
+ List<AppBottomNavVO> list = bottomNavService.getAppBottomNav();
+ return R.ok(list);
}
-
- @RequestMapping(value = "/getShopInfo", method = RequestMethod.POST)
- @ApiOperation(value = "获取商户详情")
- public R<AppShopInfoVo> getShopInfo(@RequestBody AppBaseGetDto appBaseGetDto) {
- AppShopInfoVo appShopInfoVo = shopService.getAppShopInfo(Long.valueOf(appBaseGetDto.getId()));
- return R.ok(appShopInfoVo);
- }
-
}
--
Gitblit v1.7.1