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

gongzuming

2024-09-19 a768dc3daa04d35fedfbe75c0a59b9b2545b85c4

 src/main/java/com/mzl/flower/service/impl/coupon/CouponTemplateServiceImpl2.java

@@ -264,6 +264,7 @@
                List<CouponRecordDO> couponUsageDOList = couponTemplateCustomerDOList.stream().map(pointCustomRe -> {

                    CouponRecordDO couponRecordDO = new CouponRecordDO();

                    couponRecordDO.setId(IdUtil.simpleUUID());
                    couponRecordDO.setCouponId(pointCustomRe.getCouponId());
                    couponRecordDO.setCustomerId(pointCustomRe.getCustomId());
@@ -290,7 +291,8 @@
                    couponRecordDO.setCouponDiscountType(couponTemplateDO.getCouponDiscountType());
                    couponRecordDO.setGetUserType(couponTemplateDO.getGetUserType());
                    couponRecordDO.setPoint(couponTemplateDO.getPoint());
                    couponRecordDO.setMemberId(couponRecordDO.getMemberId());
                    couponRecordDO.setMemberId(couponTemplateDO.getMemberId());
                    couponRecordDO.setImageUrl(couponTemplateDO.getImageUrl());

                    // 创建相关信息
                    couponRecordDO.create(SecurityUtils.getUserId());
@@ -462,14 +464,19 @@

    @Override
    public CouponTemplateVO getHomeActivityEffectAlert(QueryActivityEffectCouponDTO dto) {
        dto.setUserId(SecurityUtils.getUserId());

        // 存在用户是空的情况
        final CouponTemplateVO homeActivityEffectAlert = couponTemplateMapperCustom.getHomeActivityEffectAlert(dto);
        if(null!=homeActivityEffectAlert){
            // 查看当前已经领取了几张
            final Integer getCnt = couponRecordService.getUserGainCouponRecordAmountByUserId(homeActivityEffectAlert.getId(), SecurityUtils.getUserId());
            // 如果当前领取的数量小于限制领取的数量的时候，可以再次领取
            if(null!=homeActivityEffectAlert.getGetLimit() && null!=getCnt
                   && homeActivityEffectAlert.getGetLimit().compareTo(getCnt)>0){
        if(null!=homeActivityEffectAlert ){
            if(StringUtils.isNotBlank(SecurityUtils.getUserId()) ){
                // 查看当前已经领取了几张
                final Integer getCnt = couponRecordService.getUserGainCouponRecordAmountByUserId(homeActivityEffectAlert.getId(), SecurityUtils.getUserId());
                // 如果当前领取的数量小于限制领取的数量的时候，可以再次领取
                if(null!=homeActivityEffectAlert.getGetLimit() && null!=getCnt
                        && homeActivityEffectAlert.getGetLimit().compareTo(getCnt)>0){
                    return homeActivityEffectAlert;
                }
            }else{
                return homeActivityEffectAlert;
            }
        }