fix bug

gongzuming

2024-09-02 8f94fc0e3ade83686d42d55e146bfd58efcca295

fix bug

 src/main/java/com/mzl/flower/service/customer/CustomerService.java

@@ -167,9 +167,13 @@
        if (StringUtils.isNotBlank(c.getPartnerId()) || StringUtils.isNotBlank(c.getPartnerUserId())) {
            throw new ValidationException("商户已绑定合伙人，请联系客服人员进行解绑后再进行绑定");
        }
//        Partner partner = partnerMapper.selectOne(new QueryWrapper<Partner>()
//                .eq("user_id", dto.getPartnerUserId()));
        Partner partner = partnerMapper.getByIdOrUserId(dto.getPartnerUserId()); //适配id和userId
        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("合伙人不存在");
        }
@@ -182,7 +186,13 @@

    public String getPartnerName(String partnerUserId) {
        if (StringUtils.isNotBlank(partnerUserId)) {
            Partner partner = partnerMapper.getByIdOrUserId(partnerUserId);
            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 (partner == null) {
                throw new ValidationException("合伙人不存在");
            }