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

gongzuming

2024-09-20 35309b932b738d5a8537e53207d28004a8da0f89

 src/main/java/com/mzl/flower/service/partner/PartnerService.java

@@ -10,7 +10,9 @@
import com.mzl.flower.dto.request.partner.*;
import com.mzl.flower.dto.response.partner.PartnerDTO;
import com.mzl.flower.entity.partner.Partner;
import com.mzl.flower.entity.supplier.Supplier;
import com.mzl.flower.mapper.partner.PartnerMapper;
import com.mzl.flower.service.BaseService;
import com.mzl.flower.service.UploadService;
import com.mzl.flower.utils.DateUtils;
import lombok.extern.slf4j.Slf4j;
@@ -19,6 +21,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
@@ -42,6 +45,9 @@

    private final UploadService uploadService;

    @Resource
    private BaseService baseService;

    public PartnerService(PartnerMapper partnerMapper, WxMaService maService, UploadService uploadService) {
        this.partnerMapper = partnerMapper;
        this.maService = maService;
@@ -59,6 +65,7 @@
            partner.setIdCards(JSON.toJSONString(dto.getIdCards()));
            partner.create(SecurityUtils.getUserId());
            partner.setStatus(PARTNER_STATUS_AUDIT);
            partner.setIsEnabled(true);
            partnerMapper.insert(partner);
        }else{//重新修改
            partner = partnerMapper.selectById(dto.getId());
@@ -128,6 +135,12 @@
        partner.setProvince(dto.getProvince());
        partner.setCity(dto.getCity());
        partner.setRegion(dto.getRegion());
        if(StringUtils.isNotBlank(dto.getName())){
            partner.setName(dto.getName());
        }
        if(StringUtils.isNotBlank(dto.getContactTel())){
            partner.setContactTel(dto.getContactTel());
        }
        partner.update(SecurityUtils.getUserId());
        partnerMapper.updateById(partner);
    }
@@ -161,4 +174,20 @@
        partner.update(SecurityUtils.getUserId());
        partnerMapper.updateById(partner);
    }

    public void isEnable(Long id) {
        Partner partner = partnerMapper.selectById(id);
        if (partner == null) {
            throw new ValidationException("合伙人信息不存在");
        }
        if (partner.getIsEnabled()) {
            partner.setIsEnabled(false);
            //强制下线
            baseService.removeToken(partner.getUserId());
        } else {
            partner.setIsEnabled(true);
        }
        partner.update(SecurityUtils.getUserId());
        partnerMapper.updateById(partner);
    }
}