修改bug

Pu Zhibing

4 天以前 3244b550596e0330031b3f4547356927df83b0ad

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java

@@ -6,12 +6,16 @@
import com.ruoyi.account.service.TAppUserAddressService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.log.enums.OperatorType;
import com.ruoyi.common.security.service.TokenService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Objects;

/**
 * <p>
@@ -35,6 +39,17 @@
    }

    /**
     * 远程调用 通过地址id 查询地址信息
     * @param id
     * @return
     */
    @GetMapping(value = "/getAddressById/{id}")
    public R<TAppUserAddress> getAddressById(@PathVariable("id") Long id) {
        TAppUserAddress byId = appUserAddressService.getById(id);

        return R.ok(byId);
    }
    /**
     * 查询用户地址列表
     */
    @ApiOperation(tags = {"小程序-用户地址"},value = "查询用户地址列表")
@@ -42,13 +57,33 @@
    public AjaxResult<List<TAppUserAddress>> queryAddress() {
        // 用户id
        Long userId = tokenService.getLoginUserApplet().getUserId();
        return AjaxResult.ok(appUserAddressService.list(Wrappers.<TAppUserAddress>lambdaQuery().eq(TAppUserAddress::getAppUserId, userId)));
        List<TAppUserAddress> list = appUserAddressService.list(Wrappers.<TAppUserAddress>lambdaQuery().eq(TAppUserAddress::getAppUserId, userId));
        list.forEach(e->e.setUid(e.getId().toString()));
        return AjaxResult.ok(list);
    }

    /**
     * 查询用户默认地址列表
     */
    @ApiOperation(tags = {"小程序-用户地址"},value = "查询用户默认地址")
    @GetMapping(value = "/queryDefaultAddress")
    public AjaxResult<TAppUserAddress> queryDefaultAddress() {
        // 用户id
        Long userId = tokenService.getLoginUserApplet().getUserId();
        TAppUserAddress appUserAddress = appUserAddressService.getOne(Wrappers.<TAppUserAddress>lambdaQuery().eq(TAppUserAddress::getAppUserId, userId)
                .eq(TAppUserAddress::getDefaultAddress, 1));
        if(Objects.isNull(appUserAddress)){
            return AjaxResult.success();
        }
        appUserAddress.setUid(appUserAddress.getId().toString());
        return AjaxResult.success(appUserAddress);
    }


    /**
     * 添加用户地址管理
     */
    @Log(title = "【我的】添加用户地址", businessType = BusinessType.INSERT,operatorType = OperatorType.MOBILE)
    @ApiOperation(tags = {"小程序-用户地址"},value = "添加用户地址")
    @PostMapping(value = "/add")
    public AjaxResult<Boolean> add(@RequestBody TAppUserAddress dto) {
@@ -62,20 +97,70 @@
    /**
     * 修改用户地址
     */
    @Log(title = "【我的】设置默认地址", businessType = BusinessType.UPDATE,operatorType = OperatorType.MOBILE)
    @ApiOperation(tags = {"小程序-用户地址"},value = "设置默认地址")
    @GetMapping(value = "/setDefaultAddress")
    public AjaxResult<String> setDefaultAddress(@RequestParam(value = "id") Long  id) {
        TAppUserAddress appUserAddress = appUserAddressService.getById(id);
        Long userId = tokenService.getLoginUserApplet().getUserId();
        if(!appUserAddress.getAppUserId().equals(userId)){
            return AjaxResult.error("权限不足");
        }
        // 修改用户默认地址
        appUserAddressService.updateDefaultAddress(1,tokenService.getLoginUserApplet().getUserId());
        appUserAddress.setDefaultAddress(1);
        appUserAddressService.updateById(appUserAddress);
        return AjaxResult.success();
    }

    /**
     * 修改用户地址
     */
    @Log(title = "【我的】修改用户地址", businessType = BusinessType.UPDATE,operatorType = OperatorType.MOBILE)
    @ApiOperation(tags = {"小程序-用户地址"},value = "修改用户地址")
    @PostMapping(value = "/update")
    public AjaxResult<Boolean> update(@RequestBody TAppUserAddress dto) {
        Long userId = tokenService.getLoginUserApplet().getUserId();
        TAppUserAddress userAddress = appUserAddressService.getById(dto.getId());
        if(!userAddress.getAppUserId().equals(userId)){
            return AjaxResult.error("权限不足");
        }
        // 用户id
        dto.setAppUserId(userId);
        // 修改用户默认地址
        appUserAddressService.updateDefaultAddress(dto.getDefaultAddress(),dto.getAppUserId());
        return AjaxResult.ok(appUserAddressService.updateById(dto));
    }

    /**
     * 通过地址id 查询地址信息
     * @param id
     * @return
     */
    @ApiOperation(tags = {"小程序-用户地址"},value = "查询用户地址详情")
    @GetMapping(value = "/getDetailById")
    public R<TAppUserAddress> getDetailById(@RequestParam(value = "id")Long id) {
        TAppUserAddress appUserAddress = appUserAddressService.getById(id);
        Long userId = tokenService.getLoginUserApplet().getUserId();
        if(!appUserAddress.getAppUserId().equals(userId)){
            return R.fail("权限不足");
        }
        appUserAddress.setUid(appUserAddress.getId().toString());
        return R.ok(appUserAddress);
    }

    /**
     * 删除用户地址
     */
    @Log(title = "【我的】删除用户地址", businessType = BusinessType.DELETE,operatorType = OperatorType.MOBILE)
    @ApiOperation(tags = {"小程序-用户地址"},value = "删除用户地址")
    @DeleteMapping(value = "/deleteById")
    public AjaxResult<Boolean> deleteById(@RequestParam("id") Integer id) {
    public AjaxResult<Boolean> deleteById(@RequestParam("id") Long id) {
        TAppUserAddress appUserAddress = appUserAddressService.getById(id);
        Long userId = tokenService.getLoginUserApplet().getUserId();
        if(!appUserAddress.getAppUserId().equals(userId)){
            return AjaxResult.error("权限不足");
        }
        return AjaxResult.ok(appUserAddressService.removeById(id));
    }