From b977bf61c82b7dc39079974d7316b7a80cf520fa Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 02 九月 2024 09:36:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/service/customer/CustomerService.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/customer/CustomerService.java b/src/main/java/com/mzl/flower/service/customer/CustomerService.java
index 4fec567..0176b71 100644
--- a/src/main/java/com/mzl/flower/service/customer/CustomerService.java
+++ b/src/main/java/com/mzl/flower/service/customer/CustomerService.java
@@ -16,6 +16,7 @@
import com.mzl.flower.entity.partner.Partner;
import com.mzl.flower.mapper.customer.CustomerMapper;
import com.mzl.flower.mapper.partner.PartnerMapper;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -25,6 +26,7 @@
@Service
@Transactional
+@Slf4j
public class CustomerService {
@@ -169,10 +171,14 @@
}
// Partner partner = partnerMapper.selectOne(new QueryWrapper<Partner>()
// .eq("user_id", dto.getPartnerUserId()));
- Partner partner = partnerMapper.getByIdOrUserId(dto.getPartnerUserId()); //适配id和userId
- if (partner == null) {
+ List<Partner> partners = partnerMapper.getByIdOrUserId(dto.getPartnerUserId()); //适配id和userId
+ if(partners== null || partners.size() == 0){
throw new ValidationException("合伙人不存在");
}
+ if(partners.size() > 1){
+ log.error("合伙人信息重复，userId:{}", dto.getPartnerUserId());
+ }
+ Partner partner = partners.get(0);
if (!"P".equals(partner.getStatus())) {
throw new ValidationException("合伙人信息未审核通过，请联系客服人员");
}
@@ -182,7 +188,14 @@
public String getPartnerName(String partnerUserId) {
if (StringUtils.isNotBlank(partnerUserId)) {
- Partner partner = partnerMapper.getByIdOrUserId(partnerUserId);
+ List<Partner> partners = partnerMapper.getByIdOrUserId(partnerUserId); //适配id和userId
+ if(partners== null || partners.size() == 0){
+ throw new ValidationException("合伙人不存在");
+ }
+ if(partners.size() > 1){
+ log.error("合伙人信息重复，userId:{}", partnerUserId);
+ }
+ Partner partner = partners.get(0);
if (partner == null) {
throw new ValidationException("合伙人不存在");
}
--
Gitblit v1.9.3