bug修改

mitao

2025-03-14 392b42c4891cf2e6beda57ab32c51598f290f4b7

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberAddressController.java

@@ -1,21 +1,19 @@
package com.ruoyi.member.controller.forepart;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.member.dto.MemberAddressDTO;

import com.ruoyi.member.domain.vo.RegionVo;
import com.ruoyi.system.api.domain.dto.MemberAddressDTO;
import com.ruoyi.member.service.IMemberAddressService;
import com.ruoyi.member.service.IRegionService;
import com.ruoyi.system.api.domain.MemberAddress;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

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

/**
@@ -34,57 +32,32 @@
     * 获取当前商品信息
     *
     */

    @ApiModelProperty
    @Resource
    private IMemberAddressService iMemberAddressService;

    @ApiModelProperty
    @Resource
    private IRegionService  IRegionService;


    @PostMapping("/getMemberAddressOne")
    @ResponseBody
    @InnerAuth
    public R<MemberAddress> getMemberAddressOne(@RequestBody Integer userId) {
        LambdaQueryWrapper<MemberAddress> wrapper2= Wrappers.lambdaQuery();
        wrapper2.eq(MemberAddress::getMemberId,userId);
        wrapper2.eq(MemberAddress::getDelFlag,0);
        wrapper2.eq(MemberAddress::getIsDefault,2);
        MemberAddress memberAddress=iMemberAddressService.getOne(wrapper2);
        if (memberAddress==null){
            LambdaQueryWrapper<MemberAddress> wrapper= Wrappers.lambdaQuery();
            wrapper.eq(MemberAddress::getMemberId,userId);
            wrapper.eq(MemberAddress::getDelFlag,0);
            wrapper.last("limit 1");
            memberAddress=iMemberAddressService.getOne(wrapper2);
        }
        return R.ok(memberAddress);

    }

    @PostMapping("/getRegione")
    @ResponseBody
    @ApiOperation(value = "用户端-获取三级联动的地址")
    public R<List<RegionVo>> getRegione() {
        return R.ok(IRegionService.listRegionVo());
    }

    @PostMapping("/getMemberAddressList")
    @ResponseBody
    @ApiOperation(value = "用户端-获取用户地址")
    public R<PageDTO<MemberAddress>> getMemberAddressList(@RequestBody MemberAddressDTO memberAddressDTO) {
        return R.ok(iMemberAddressService.getMemberAddressList(memberAddressDTO));
    }

    @PostMapping("/getDefaultMemberAddressList")
    @ResponseBody
    @ApiOperation(value = "用户端-获取默认用户地址")
    public R<MemberAddress> getDefaultMemberAddressList(@RequestBody MemberAddressDTO memberAddressDTO) {
        return R.ok(iMemberAddressService.getDefaultMemberAddressList(memberAddressDTO));
    }

    @PostMapping("/addMemberAddress")
    @ResponseBody
    @ApiOperation(value = "用户端-用户添加或者修改地址")
    public R addMemberAddress(@RequestBody MemberAddressDTO memberAddressDTO) {
        iMemberAddressService.addMemberAddress(memberAddressDTO);
@@ -92,7 +65,6 @@
    }

    @PostMapping("/delMemberAddress")
    @ResponseBody
    @ApiOperation(value = "用户端-用户删除地址")
    public R delMemberAddress(@RequestBody MemberAddressDTO memberAddressDTO) {
        iMemberAddressService.delMemberAddress(memberAddressDTO);