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

gongzuming

2024-09-19 a768dc3daa04d35fedfbe75c0a59b9b2545b85c4

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

@@ -20,6 +20,7 @@
import com.mzl.flower.mapper.partner.PartnerMapper;
import com.mzl.flower.service.menber.MemberGrowthRecordService;
import lombok.extern.slf4j.Slf4j;
import com.mzl.flower.service.BaseService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -40,6 +41,9 @@
    private final PartnerMapper partnerMapper;
    @Resource
    private MemberGrowthRecordService memberGrowthRecordService;

    @Resource
    private BaseService baseService;

    public CustomerService(CustomerMapper customerMapper, PartnerMapper partnerMapper) {
        this.customerMapper = customerMapper;
@@ -79,6 +83,8 @@
            }

            customer.create(SecurityUtils.getUserId());
            customer.setIsEnabled(true);
            customer.setLevelId(Long.valueOf(Constants.DEFAULT_MEMBER_ID));
            customerMapper.insert(customer);
        } else {//重新修改
            customer = customerMapper.selectById(dto.getId());
@@ -214,6 +220,21 @@
        }
        return null;
    }
    public void isEnable(Long id) {
        Customer customer = customerMapper.selectById(id);
        if (customer == null) {
            throw new ValidationException("商户信息不存在");
        }
        if (customer.getIsEnabled()) {
            customer.setIsEnabled(false);
            //强制下线
            baseService.removeToken(customer.getUserId());
        } else {
            customer.setIsEnabled(true);
        }
        customer.update(SecurityUtils.getUserId());
        customerMapper.updateById(customer);
    }

    /**
     * 根据会员等级获取等级下的customer信息