8.3
luodangjia
2024-08-03 67157345fe1878681e39ec186ef37ff6b3b5c1fc
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserRecipientController.java
@@ -7,7 +7,9 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.system.api.model.LoginUserInfo;
import com.ruoyi.user.entity.Region;
import com.ruoyi.user.entity.UserRecipient;
import com.ruoyi.user.service.RegionService;
import com.ruoyi.user.service.UserRecipientService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -97,6 +99,9 @@
        if (null == loginUser) {
            return R.loginExpire("登录失效!");
        }
        Region one = regionService.lambdaQuery().eq(Region::getCode, userRecipient.getCityCode()).one();
        userRecipient.setCity(one.getName());
        userRecipient.setUserId(loginUser.getUserid());
        // 当前新增收货地址为默认地址时
        boolean result = recipientService.updateBatchAddress(userRecipient, loginUser.getUserid());
@@ -126,6 +131,9 @@
        return update ? R.ok() : R.fail();
    }
    @Resource
    private RegionService regionService;
    /**
     * 修改收货地址
     *
@@ -139,6 +147,8 @@
        if (null == loginUser) {
            return R.loginExpire("登录失效!");
        }
        Region one = regionService.lambdaQuery().eq(Region::getCode, userRecipient.getCityCode()).one();
        userRecipient.setCity(one.getName());
        // 当前修改收货地址为默认地址时
        boolean result = recipientService.updateBatchAddress(userRecipient, loginUser.getUserid());
        return result && recipientService.updateById(userRecipient) ? R.ok() : R.fail();