From 156e141e55a8abf486157d1fa89d25e23f4a06a3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 25 八月 2023 19:32:30 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java | 66 ++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 17 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java
index 3f01cbb..9c75e79 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java
@@ -2,24 +2,27 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.dto.AppPageDto;
+import com.ruoyi.goods.domain.dto.AppRecommendGoodsPageDto;
import com.ruoyi.goods.domain.dto.AppSearchGoodsPageDto;
import com.ruoyi.goods.domain.dto.AppShopGoodsPageDto;
+import com.ruoyi.goods.domain.vo.AppHomeActivityVo;
import com.ruoyi.goods.domain.vo.AppSimpleActivityGoodsVo;
import com.ruoyi.goods.domain.vo.AppSimpleGoodsVo;
import com.ruoyi.goods.service.goods.GoodsService;
+import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.service.RemoteMemberService;
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;
/**
@@ -35,19 +38,17 @@
public class AppHomeController extends BaseController {
- @Autowired
+ @Resource
private RemoteMemberService memberService;
- @Autowired
+ @Resource
private GoodsService goodsService;
-
- @RequestMapping(value = "/pageRecommendGoods", method = RequestMethod.POST)
- @ApiOperation(value = "推荐商品")
- public R<Page<AppSimpleGoodsVo>> pageRecommendGoods(@RequestBody AppPageDto appPageDto) {
+ @RequestMapping(value = "/pageActivityGoods", method = RequestMethod.POST)
+ @ApiOperation(value = "热门活动")
+ public R<AppHomeActivityVo> pageActivityGoods(@RequestBody AppRecommendGoodsPageDto appRecommendGoodsPageDto) {
Long userId = SecurityUtils.getUserId();
- logger.info("userId-----"+userId.toString());
Long shopId = null;
if(userId!=null){
Member member = memberService.getMember(userId).getData();
@@ -56,14 +57,36 @@
}
}
if(shopId==null){
- shopId = 1L;
+ shopId = appRecommendGoodsPageDto.getPositionShopId();
+ }
+ if(shopId==null){
+ throw new ServiceException(AppErrorConstant.NO_POSITION);
+ }
+ AppHomeActivityVo homeActivityVo = goodsService.pageActivityGoods(shopId);
+ return R.ok(homeActivityVo);
+ }
+
+ @RequestMapping(value = "/pageRecommendGoods", method = RequestMethod.POST)
+ @ApiOperation(value = "商城精选")
+ public R<Page<AppSimpleGoodsVo>> pageRecommendGoods(@RequestBody AppRecommendGoodsPageDto appRecommendGoodsPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ Long shopId = null;
+ if(userId!=null){
+ Member member = memberService.getMember(userId).getData();
+ if(member!=null&&member.getRelationShopId()!=null){
+ shopId = member.getRelationShopId();
+ }
+ }
+ if(shopId==null){
+ shopId = appRecommendGoodsPageDto.getPositionShopId();
+ }
+ if(shopId==null){
+ throw new ServiceException(AppErrorConstant.NO_POSITION);
}
Page<AppSimpleGoodsVo> page = new Page<>();
- page.setSize(appPageDto.getPageSize());
- page.setCurrent(appPageDto.getPageNum());
- //logger.info("shopId"+shopId.toString());
+ page.setSize(appRecommendGoodsPageDto.getPageSize());
+ page.setCurrent(appRecommendGoodsPageDto.getPageNum());
List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageRecommendGoods(page,shopId);
- //logger.info("appSimpleGoodsVoList"+appSimpleGoodsVoList.toString());
return R.ok(page.setRecords(appSimpleGoodsVoList));
}
@@ -76,8 +99,11 @@
if(member!=null&&member.getRelationShopId()!=null){
appShopGoodsPageDto.setShopId(member.getRelationShopId());
}else{
- appShopGoodsPageDto.setShopId(1L);
+ appShopGoodsPageDto.setShopId(appShopGoodsPageDto.getPositionShopId());
}
+ }
+ if(appShopGoodsPageDto.getShopId()==null){
+ throw new ServiceException(AppErrorConstant.NO_POSITION);
}
Page<AppSimpleGoodsVo> page = new Page<>();
page.setSize(appShopGoodsPageDto.getPageSize());
@@ -95,8 +121,11 @@
if(member!=null&&member.getRelationShopId()!=null){
appSearchGoodsPageDto.setShopId(member.getRelationShopId());
}else{
- appSearchGoodsPageDto.setShopId(1L);
+ appSearchGoodsPageDto.setShopId(appSearchGoodsPageDto.getPositionShopId());
}
+ }
+ if(appSearchGoodsPageDto.getShopId()==null){
+ throw new ServiceException(AppErrorConstant.NO_POSITION);
}
Page<AppSimpleGoodsVo> page = new Page<>();
page.setSize(appSearchGoodsPageDto.getPageSize());
@@ -114,9 +143,12 @@
if(member!=null&&member.getRelationShopId()!=null){
appSearchGoodsPageDto.setShopId(member.getRelationShopId());
}else{
- appSearchGoodsPageDto.setShopId(1L);
+ appSearchGoodsPageDto.setShopId(appSearchGoodsPageDto.getPositionShopId());
}
}
+ if(appSearchGoodsPageDto.getShopId()==null){
+ throw new ServiceException(AppErrorConstant.NO_POSITION);
+ }
Page<AppSimpleActivityGoodsVo> page = new Page<>();
page.setSize(appSearchGoodsPageDto.getPageSize());
page.setCurrent(appSearchGoodsPageDto.getPageNum());
--
Gitblit v1.7.1