修改bug

Pu Zhibing

20 小时以前 6c3f781630bc0c559ceca1a69d4c9e7e33e5daf1

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

@@ -1,6 +1,7 @@
package com.ruoyi.goods.controller.miniapp;

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.goods.domain.dto.AppGoodsInfoGetDto;
@@ -10,6 +11,7 @@
import com.ruoyi.goods.domain.vo.AppShoppingCartVo;
import com.ruoyi.goods.service.goods.GoodsService;
import com.ruoyi.goods.service.goods.ShoppingCartService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.AppBaseBathDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.service.RemoteMemberService;
@@ -21,6 +23,7 @@
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;

/**
@@ -57,8 +60,7 @@
            }
        }
        if(appGoodsInfoGetDto.getShopId()==null){
            //throw new ServiceException(AppErrorConstant.NO_POSITION);
            appGoodsInfoGetDto.setShopId(1L);
            throw new ServiceException(AppErrorConstant.NO_POSITION);
        }
        AppGoodsInfoVo appGoodsInfoVo = goodsService.getGoodsInfo(appGoodsInfoGetDto);
        return R.ok(appGoodsInfoVo);
@@ -68,6 +70,10 @@
    @ApiOperation(value = "获取购物车列表")
    public R<List<AppShoppingCartVo>> listShoppingCart() {
        Long userId = SecurityUtils.getUserId();
        System.err.println("登录用户id：" + userId);
        if(null == userId){
            return R.ok(new ArrayList<>());
        }
        Member member = memberService.getMember(userId).getData();
        Long shopId = member.getRelationShopId();
        List<AppShoppingCartVo> appShoppingCartVoList = shoppingCartService.listShoppingCartVo(userId, shopId);
@@ -81,7 +87,7 @@
        if(userId != null){
            Member member = memberService.getMember(userId).getData();
            appShoppingCartAddDto.setUserId(userId);
            if(appShoppingCartAddDto.getShopId()==null&&member!=null&&member.getRelationShopId()!=null){
            if(member!=null&&member.getBindingFlag()==1&&member.getRelationShopId()!=null){
                appShoppingCartAddDto.setShopId(member.getRelationShopId());
            }
        }
@@ -96,7 +102,7 @@
        if(userId!=null){
            Member member = memberService.getMember(userId).getData();
            appShoppingCartChangeDto.setUserId(userId);
            if(member!=null&&member.getRelationShopId()!=null){
            if(member!=null&&member.getBindingFlag()==1&&member.getRelationShopId()!=null){
                appShoppingCartChangeDto.setShopId(member.getRelationShopId());
            }
        }
@@ -113,6 +119,14 @@
        return R.ok();
    }


    @RequestMapping(value = "/countShoppingCart", method = RequestMethod.POST)
    @ApiOperation(value = "获取购物车数量")
    public R<Integer> countShoppingCart() {
        Long userId = SecurityUtils.getUserId();
        Member member = memberService.getMember(userId).getData();
        Long shopId = member.getRelationShopId();
        Integer count = shoppingCartService.countShoppingCart(userId, shopId);
        return R.ok(count);
    }

}