Merge branch 'blnka' of http://120.27.238.55:7000/r/xc-mall into blnka

KKSU

2024-02-26 9b0211dcf5bf657307b72f7fb1e9c2e607ecc35c

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

@@ -76,15 +76,17 @@
            return;
        }

        if (CollUtil.isEmpty(mallVipBenefits.getDetails())) {
            throw new FebsException("权益明细不能为空");
        }
//        if (CollUtil.isEmpty(mallVipBenefits.getDetails())) {
//            throw new FebsException("权益明细不能为空");
//        }

        this.baseMapper.insert(mallVipBenefits);

        mallVipBenefits.getDetails().forEach(item -> {
            item.setBenefitsId(mallVipBenefits.getId());
        });
        if (CollUtil.isNotEmpty(mallVipBenefits.getDetails())) {
            mallVipBenefits.getDetails().forEach(item -> {
                item.setBenefitsId(mallVipBenefits.getId());
            });
        }
        this.mallVipBenefitsDetailsService.saveBatch(mallVipBenefits.getDetails());
    }

@@ -170,7 +172,7 @@
        recordQuery.ge(MallVipBenefitsRecord::getReceiveTime, DateUtil.beginOfDay(new Date()))
                .le(MallVipBenefitsRecord::getReceiveTime, DateUtil.endOfDay(new Date()))
                .eq(MallVipBenefitsRecord::getMemberId, member.getId())
                .eq(MallVipBenefitsRecord::getBenefitsType, vipBenefits.getType())
                .eq(MallVipBenefitsRecord::getBenefitsType, vipBenefits.getGainType())
                .eq(MallVipBenefitsRecord::getReceiveId, Long.parseLong(benefits.getContent()));
        List<MallVipBenefitsRecord> mallVipBenefitsRecords = mallVipBenefitsRecordMapper.selectList(recordQuery);
        if (CollUtil.isNotEmpty(mallVipBenefitsRecords)) {
@@ -269,6 +271,7 @@
            memberCoupon.setInviteId(member.getInviteId());
            memberCoupon.setCouponUuid(IdUtil.simpleUUID());
            memberCoupon.setState(1);
            memberCoupon.setFromType(2);
            memberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(), coupon.getExpireDay()));
            memberCoupon.setMemberId(member.getId());
            mallMemberCouponMapper.insert(memberCoupon);
@@ -279,4 +282,18 @@
        mallVipBenefitsRecordMapper.insert(record);
    }

    @Override
    public void switchBenefitsShow(Long id) {
        MallVipBenefits vipBenefits = this.baseMapper.selectById(id);

        MallVipBenefits update = new MallVipBenefits();
        if (vipBenefits.getIsShow() == 1) {
            update.setIsShow(2);
        } else {
            update.setIsShow(1);
        }

        update.setId(vipBenefits.getId());
        this.baseMapper.updateById(update);
    }
}