Merge remote-tracking branch 'origin/master-v2' into master-v2

gongzuming

2024-09-02 a92e296c28d4c09055f53293378da001117ec979

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

@@ -14,6 +14,7 @@
import com.mzl.flower.dto.response.partner.PartnerDTO;
import com.mzl.flower.entity.customer.Customer;
import com.mzl.flower.entity.partner.Partner;
import com.mzl.flower.enums.TrueOrFalseEnum;
import com.mzl.flower.mapper.customer.CustomerMapper;
import com.mzl.flower.mapper.partner.PartnerMapper;
import lombok.extern.slf4j.Slf4j;
@@ -169,16 +170,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 +189,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("合伙人不存在");
            }
@@ -203,4 +203,21 @@
        }
        return null;
    }

    /**
     * 根据会员等级获取等级下的customer信息
     * @param levelId
     * @return
     */
    public List<Customer> getCustomerListByLevelId(Integer levelId){
        if(null != levelId){
            QueryWrapper<Customer> customerQueryWrapper=new QueryWrapper<>();
            customerQueryWrapper.lambda()
                    .eq(Customer::getDeleted, TrueOrFalseEnum.FALSE.isFlag())
                    .eq(Customer::getLevelId,levelId);
            return customerMapper.selectList(customerQueryWrapper);
        }
        return null;
    }

}