From fb614b7b54591edb1ab1cc4cc3b1fcd2d6d9262b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 19 六月 2024 15:27:09 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/RecipientServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/RecipientServiceImpl.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/RecipientServiceImpl.java
index 7c50131..4507a7c 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/RecipientServiceImpl.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/RecipientServiceImpl.java
@@ -2,12 +2,14 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.goods.domain.Recipient;
import com.ruoyi.goods.mapper.RecipientMapper;
import com.ruoyi.goods.service.IRecipientService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -20,17 +22,20 @@
@Service
public class RecipientServiceImpl extends ServiceImpl<RecipientMapper, Recipient> implements IRecipientService {
+ @Resource
+ private TokenService tokenService;
+
@Override
@Transactional(rollbackFor = Exception.class)
- public String addressSaveOrUpdate(Recipient recipient) {
+ public Boolean addressSaveOrUpdate(Recipient recipient) {
boolean result;
// 主键ID为空，新增收货地址
- if (StringUtils.isEmpty(String.valueOf(recipient.getId()))) {
- recipient.setUserId(SecurityUtils.getUserId().intValue());
+ if (null == recipient.getId()) {
+ recipient.setUserId(tokenService.getLoginUserStudy().getUserid());
result = this.save(recipient);
} else {
result = this.updateById(recipient);
}
- return result ? "操作成功！" : "操作失败！";
+ return result;
}
}
--
Gitblit v1.7.1