冲突

gongzuming

2024-08-29 824edc826c92312c150a2f0eea9bdd2bfcb82b2f

 src/main/java/com/mzl/flower/service/BaseService.java

@@ -459,6 +459,16 @@
        return p;
    }

    protected Customer getCustomer(Long id){
        Customer p = customerMapper.selectById(id);

        if(p == null){
            throw new ValidationException("商户不存在");
        }

        return p;
    }

    public Partner getCurrentPartner(){
        String userId = SecurityUtils.getUserId();
        Partner p = partnerMapper.selectOne(new QueryWrapper<Partner>()