fix

Hentua

2024-01-25 800c109fbc380dcd2cc42570a46b4329c4840366

 src/main/java/cc/mrbird/febs/vip/service/impl/MallVipConfigServiceImpl.java

@@ -1,8 +1,11 @@
package cc.mrbird.febs.vip.service.impl;

import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.vip.entity.MallVipBenefits;
import cc.mrbird.febs.vip.entity.MallVipConfig;
@@ -33,6 +36,7 @@

    private final IMallVipConfigBenefitsService mallVipConfigBenefitsService;
    private final MallMemberMapper mallMemberMapper;
    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;

    @Override
    public IPage<MallVipConfig> vipConfigList(QueryRequest request) {
@@ -46,7 +50,7 @@
    }

    @Override
    @Transactional
    @Transactional(rollbackFor = Exception.class)
    public void addVipConfig(MallVipConfig config) {
        this.baseMapper.insert(config);

@@ -117,8 +121,11 @@
                return true;
            }

            DataDictionaryCustom data = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.VIP_DATE.getType(), DataDictionaryEnum.VIP_DATE.getCode());

            String todayTime = DateUtil.format(new Date(), "MM-dd");
            // 会员日
            return item.getGainType() == 1;
            return item.getGainType() == 1 && StrUtil.equals(data.getValue(), todayTime);
        }).max(Comparator.comparing(MallVipBenefits::getScoreMultiple));

        return max.orElseGet(max::get);