flowerbackend-v2.git

			@@ -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("合伙人不存在");
			}

			@@ -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>

	src/main/java/com/mzl/flower/mapper/partner/PartnerMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/service/customer/CustomerService.java	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/partner/PartnerMapper.xml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -19,5 +19,5 @@

			PartnerDTO getCurrentPartner(@Param("userId")String userId);

			List<Partner> getByIdOrUserId(@Param("partnerUserId") String partnerUserId);
			// Partner getByIdOrUserId(@Param("partnerUserId") String partnerUserId);
			}