Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

无关风月

2024-12-11 4d7a208f388e42e7dd83dab0e38eadfa0847de1c

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

@@ -96,9 +96,13 @@
    @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());
        TAppUserAddress appUserAddress = appUserAddressService.getById(id);
        appUserAddress.setDefaultAddress(1);
        appUserAddressService.updateById(appUserAddress);
        return AjaxResult.success();
@@ -110,8 +114,13 @@
    @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(tokenService.getLoginUserApplet().getUserId());
        dto.setAppUserId(userId);
        // 修改用户默认地址
        appUserAddressService.updateDefaultAddress(dto.getDefaultAddress(),dto.getAppUserId());
        return AjaxResult.ok(appUserAddressService.updateById(dto));
@@ -126,6 +135,10 @@
    @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);
    }
@@ -136,6 +149,11 @@
    @ApiOperation(tags = {"小程序-用户地址"},value = "删除用户地址")
    @DeleteMapping(value = "/deleteById")
    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));
    }