合併代碼

puzhibing

2024-10-08 6f1a56eb02cb6eb7848e2df6773bc5abfee11efd

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

@@ -12,6 +12,7 @@
import org.springframework.web.bind.annotation.*;

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

/**
 * <p>
@@ -68,8 +69,11 @@
        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.ok(appUserAddress);
        return AjaxResult.success(appUserAddress);
    }


@@ -106,6 +110,8 @@
    @ApiOperation(tags = {"小程序-用户地址"},value = "修改用户地址")
    @PostMapping(value = "/update")
    public AjaxResult<Boolean> update(@RequestBody TAppUserAddress dto) {
        // 用户id
        dto.setAppUserId(tokenService.getLoginUserApplet().getUserId());
        // 修改用户默认地址
        appUserAddressService.updateDefaultAddress(dto.getDefaultAddress(),dto.getAppUserId());
        return AjaxResult.ok(appUserAddressService.updateById(dto));
@@ -119,7 +125,9 @@
    @ApiOperation(tags = {"小程序-用户地址"},value = "查询用户地址详情")
    @GetMapping(value = "/getDetailById")
    public R<TAppUserAddress> getDetailById(@RequestParam(value = "id")Long id) {
        return R.ok(appUserAddressService.getById(id));
        TAppUserAddress appUserAddress = appUserAddressService.getById(id);
        appUserAddress.setUid(appUserAddress.getId().toString());
        return R.ok(appUserAddress);
    }

    /**
@@ -127,7 +135,7 @@
     */
    @ApiOperation(tags = {"小程序-用户地址"},value = "删除用户地址")
    @DeleteMapping(value = "/deleteById")
    public AjaxResult<Boolean> deleteById(@RequestParam("id") Integer id) {
    public AjaxResult<Boolean> deleteById(@RequestParam("id") Long id) {
        return AjaxResult.ok(appUserAddressService.removeById(id));
    }