From 0d864c9bf892fd7c56600e197072e07c57847b34 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期一, 02 九月 2024 14:07:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-v2
---
src/main/java/com/mzl/flower/mapper/partner/PartnerMapper.java | 2 +-
src/main/java/com/mzl/flower/service/customer/CustomerService.java | 29 ++++++++++++++---------------
src/main/resources/mapper/partner/PartnerMapper.xml | 8 ++++----
3 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/mzl/flower/mapper/partner/PartnerMapper.java b/src/main/java/com/mzl/flower/mapper/partner/PartnerMapper.java
index 951aa12..d3a5eeb 100644
--- a/src/main/java/com/mzl/flower/mapper/partner/PartnerMapper.java
+++ b/src/main/java/com/mzl/flower/mapper/partner/PartnerMapper.java
@@ -19,5 +19,5 @@
PartnerDTO getCurrentPartner(@Param("userId")String userId);
- List<Partner> getByIdOrUserId(@Param("partnerUserId") String partnerUserId);
+// Partner getByIdOrUserId(@Param("partnerUserId") String partnerUserId);
}
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("合伙人不存在");
}
diff --git a/src/main/resources/mapper/partner/PartnerMapper.xml b/src/main/resources/mapper/partner/PartnerMapper.xml
index 473fe1d..be23dd8 100644
--- a/src/main/resources/mapper/partner/PartnerMapper.xml
+++ b/src/main/resources/mapper/partner/PartnerMapper.xml
@@ -38,8 +38,8 @@
parameterType="java.lang.String">
select * from t_partner_info t where t.deleted= 0 AND t.user_id = #{userId}
</select>
- <select id="getByIdOrUserId" resultType="com.mzl.flower.entity.partner.Partner"
- parameterType="java.lang.String">
- select * from t_partner_info t where t.deleted= 0 AND (t.id = #{partnerUserId} or t.user_id = #{partnerUserId})
- </select>
+<!-- <select id="getByIdOrUserId" resultType="com.mzl.flower.entity.partner.Partner"-->
+<!-- parameterType="java.lang.String">-->
+<!-- select * from t_partner_info t where t.deleted= 0 AND (t.id = #{partnerUserId} or t.user_id = #{partnerUserId})-->
+<!-- </select>-->
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3