jiangqs
2023-04-30 dca0031ad5552679d6dfbb80d6edd7adbfc7ec2c
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java
File was renamed from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppGoodsController.java
@@ -1,16 +1,17 @@
package com.ruoyi.member.controller.miniapp;
package com.ruoyi.order.controller.miniapp;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.member.domain.dto.AppBaseBathDto;
import com.ruoyi.member.domain.dto.AppGoodsInfoGetDto;
import com.ruoyi.member.domain.dto.AppShoppingCartAddDto;
import com.ruoyi.member.domain.dto.AppShoppingCartChangeDto;
import com.ruoyi.member.domain.vo.AppGoodsInfoVo;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.order.domain.dto.AppBaseBathDto;
import com.ruoyi.order.domain.dto.AppGoodsInfoGetDto;
import com.ruoyi.order.domain.dto.AppShoppingCartAddDto;
import com.ruoyi.order.domain.dto.AppShoppingCartChangeDto;
import com.ruoyi.order.domain.vo.AppGoodsInfoVo;
import com.ruoyi.order.service.goods.GoodsService;
import com.ruoyi.order.service.goods.ShopGoodsService;
import com.ruoyi.order.service.order.ShoppingCartService;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.service.goods.GoodsService;
import com.ruoyi.system.service.order.ShoppingCartService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,18 +36,17 @@
    private GoodsService goodsService;
    @Autowired
    private MemberService memberService;
    private RemoteMemberService memberService;
    @Autowired
    private ShoppingCartService shoppingCartService;
    @RequestMapping(value = "/getGoodsInfo", method = RequestMethod.POST)
    @ApiOperation(value = "获取商品详情")
    public R<AppGoodsInfoVo> getGoodsInfo(@RequestBody AppGoodsInfoGetDto appGoodsInfoGetDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = remoteMemberService.getMember(userId).getData();
            Member member = memberService.getMember(userId).getData();
            if(member!=null&&member.getRealtionShopId()!=null){
                appGoodsInfoGetDto.setShopId(member.getRealtionShopId());
            }
@@ -60,7 +60,7 @@
    public R addShoppingCart(@RequestBody AppShoppingCartAddDto appShoppingCartAddDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = memberService.getById(userId);
            Member member = memberService.getMember(userId).getData();
            appShoppingCartAddDto.setUserId(userId);
            if(member!=null&&member.getRealtionShopId()!=null){
                appShoppingCartAddDto.setShopId(member.getRealtionShopId());
@@ -75,7 +75,7 @@
    public R changeShoppingCart(@RequestBody AppShoppingCartChangeDto appShoppingCartChangeDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = memberService.getById(userId);
            Member member = memberService.getMember(userId).getData();
            appShoppingCartChangeDto.setUserId(userId);
            if(member!=null&&member.getRealtionShopId()!=null){
                appShoppingCartChangeDto.setShopId(member.getRealtionShopId());
@@ -90,7 +90,7 @@
    public R changeShoppingCart(@RequestBody AppBaseBathDto appBaseBathDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = memberService.getById(userId);
            Member member = memberService.getMember(userId).getData();
            appBaseBathDto.setUserId(userId);
        }
        shoppingCartService.deleteShoppingCart(appBaseBathDto);