bug

jiangqs

2023-08-21 c93e76c57a98e35abbf62d2f514d9ba51efd3243

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java

@@ -6,23 +6,23 @@
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.goods.domain.dto.AppRecommendGoodsPageDto;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.AppPageDto;
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;

/**
@@ -38,16 +38,36 @@
public class AppHomeController extends BaseController {


    @Autowired
    @Resource
    private RemoteMemberService memberService;

    @Autowired
    @Resource
    private GoodsService goodsService;


    @RequestMapping(value = "/pageActivityGoods", method = RequestMethod.POST)
    @ApiOperation(value = "热门活动")
    public R<AppHomeActivityVo> pageActivityGoods(@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);
        }
        AppHomeActivityVo homeActivityVo = goodsService.pageActivityGoods(shopId);
        return R.ok(homeActivityVo);
    }

    @RequestMapping(value = "/pageRecommendGoods", method = RequestMethod.POST)
    @ApiOperation(value = "推荐商品")
    @ApiOperation(value = "商城精选")
    public R<Page<AppSimpleGoodsVo>> pageRecommendGoods(@RequestBody AppRecommendGoodsPageDto appRecommendGoodsPageDto) {
        Long userId = SecurityUtils.getUserId();
        Long shopId = null;
@@ -56,7 +76,8 @@
            if(member!=null&&member.getRelationShopId()!=null){
                shopId = member.getRelationShopId();
            }
        }else{
        }
        if(shopId==null){
            shopId = appRecommendGoodsPageDto.getPositionShopId();
        }
        if(shopId==null){