From cdabe8b7b132b8d947020fa6e528c8d3dbfa9b41 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期一, 02 九月 2024 16:11:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/service/customer/CustomerService.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 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 0176b71..13d2701 100644
--- a/src/main/java/com/mzl/flower/service/customer/CustomerService.java
+++ b/src/main/java/com/mzl/flower/service/customer/CustomerService.java
@@ -169,16 +169,16 @@
if (StringUtils.isNotBlank(c.getPartnerId()) || StringUtils.isNotBlank(c.getPartnerUserId())) {
throw new ValidationException("商户已绑定合伙人，请联系客服人员进行解绑后再进行绑定");
}
-// Partner partner = partnerMapper.selectOne(new QueryWrapper<Partner>()
-// .eq("user_id", dto.getPartnerUserId()));
- List<Partner> partners = partnerMapper.getByIdOrUserId(dto.getPartnerUserId()); //适配id和userId
- if(partners== null || partners.size() == 0){
+ Partner partner;
+ try {
+ long id = Long.parseLong(dto.getPartnerUserId());
+ partner = partnerMapper.selectById(id);
+ } catch (Exception e) {
+ partner =partnerMapper.selectOne(new QueryWrapper<Partner>().eq("user_id", dto.getPartnerUserId()));
+ }
+ if (partner == null) {
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("合伙人信息未审核通过，请联系客服人员");
}
@@ -188,14 +188,13 @@
public String getPartnerName(String partnerUserId) {
if (StringUtils.isNotBlank(partnerUserId)) {
- List<Partner> partners = partnerMapper.getByIdOrUserId(partnerUserId); //适配id和userId
- if(partners== null || partners.size() == 0){
- throw new ValidationException("合伙人不存在");
+ Partner partner;
+ try {
+ long id = Long.parseLong(partnerUserId);
+ partner = partnerMapper.selectById(id);
+ } catch (Exception e) {
+ partner =partnerMapper.selectOne(new QueryWrapper<Partner>().eq("user_id", partnerUserId));
}
- if(partners.size() > 1){
- log.error("合伙人信息重复，userId:{}", partnerUserId);
- }
- Partner partner = partners.get(0);
if (partner == null) {
throw new ValidationException("合伙人不存在");
}
--
Gitblit v1.9.3