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

gongzuming

2024-09-02 a92e296c28d4c09055f53293378da001117ec979

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

 pom.xml

@@ -21,6 +21,7 @@
        <springfox-swagger.version>2.9.2</springfox-swagger.version>
        <io.swagger.version>1.5.22</io.swagger.version>
        <base.version>1.0-SNAPSHOT</base.version>
        <mybatis-plus.version>3.4.1</mybatis-plus.version>
    </properties>

    <dependencies>
@@ -55,6 +56,8 @@
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
            <version>1.18.20</version>
            <scope>provided</scope>
            <optional>true</optional>
        </dependency>

@@ -259,6 +262,14 @@
            <artifactId>aspectjweaver</artifactId>
            <version>1.9.7</version>
        </dependency>

        <dependency>
            <groupId>org.redisson</groupId>
            <artifactId>redisson</artifactId>
            <version>3.15.6</version>
        </dependency>


    </dependencies>

    <build>

 src/main/java/com/mzl/flower/config/RedissonConfig.java

对比新文件
@@ -0,0 +1,45 @@
package com.mzl.flower.config;

import org.redisson.Redisson;
import org.redisson.api.RedissonClient;
import org.redisson.config.Config;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

@Configuration
public class RedissonConfig {

    @Value("${spring.redis.host}")
    private String host;

    @Value("${spring.redis.port}")
    private Integer port;

    @Value("${spring.redis.password}")
    private String password;

    @Value("${spring.redis.timeout:10000}")
    private int timeout; // 10秒

    @Value("${spring.redis.connectionPoolSize:100}")
    private int connectionPoolSize; // 100个连接

    @Value("${spring.redis.connectionMinimumIdleSize:20}")
    private int connectionMinimumIdleSize; // 20个空闲连接



    @Bean(destroyMethod = "shutdown")
    public RedissonClient redissonClient() {
        Config config = new Config();
        config.useSingleServer()
                .setAddress(String.format("redis://%s:%d", host, port))
                .setPassword(password)
                .setTimeout(timeout)
                .setConnectionPoolSize(connectionPoolSize)
                .setConnectionMinimumIdleSize(connectionMinimumIdleSize);

        return Redisson.create(config);
    }
}

 src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateActivyVO.java

@@ -151,5 +151,23 @@
    @ApiModelProperty(value = "使用时间类型")
    private String usageTypeName;

    @ApiModelProperty(value = "领取后有效类型名称")
    private String usageTimeTypeName;

    @ApiModelProperty(value = "领取渠道（COUPON_GET_TYPE）")
    @DictTrans(target = "getTypeName",codeType = "COUPON_GET_TYPE")
    private String getType;

    /**
     * 领取渠道（COUPON_GET_TYPE）首页弹窗、活动入口、领券中心
     */
    @ApiModelProperty(value = "领取渠道（COUPON_GET_TYPE）")
    private String getTypeName;

    /**
     * 每人限领
     */
    @ApiModelProperty(value = "每人限领")
    private Integer getLimit;

}

 src/main/java/com/mzl/flower/mapper/coupon/CouponRecordMapperCustom.java

@@ -32,4 +32,6 @@
    Integer statisCouponPointCurMonPointAmonut(@Param("param") QueryCouponStatisticsBO queryCouponStatisticsBO);

    List<CouponRecordVO> getMineCouponRecordList(@Param("param") QueryMineCouponRecordDTO dto);

    void checkCouponExpired(@Param("param") QueryMineCouponRecordDTO dto);
}

 src/main/java/com/mzl/flower/service/coupon/CouponRecordService.java

@@ -66,4 +66,11 @@

    List<CouponRecordVO> getMineCouponRecordList(QueryMineCouponRecordDTO dto);

    /**
     * 检查优惠券是否到期
     * @param dto
     */
    void checkCouponExpired(QueryMineCouponRecordDTO dto);


}

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

@@ -14,6 +14,7 @@
import com.mzl.flower.dto.response.partner.PartnerDTO;
import com.mzl.flower.entity.customer.Customer;
import com.mzl.flower.entity.partner.Partner;
import com.mzl.flower.enums.TrueOrFalseEnum;
import com.mzl.flower.mapper.customer.CustomerMapper;
import com.mzl.flower.mapper.partner.PartnerMapper;
import lombok.extern.slf4j.Slf4j;
@@ -202,4 +203,21 @@
        }
        return null;
    }

    /**
     * 根据会员等级获取等级下的customer信息
     * @param levelId
     * @return
     */
    public List<Customer> getCustomerListByLevelId(Integer levelId){
        if(null != levelId){
            QueryWrapper<Customer> customerQueryWrapper=new QueryWrapper<>();
            customerQueryWrapper.lambda()
                    .eq(Customer::getDeleted, TrueOrFalseEnum.FALSE.isFlag())
                    .eq(Customer::getLevelId,levelId);
            return customerMapper.selectList(customerQueryWrapper);
        }
        return null;
    }

}

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

@@ -1,5 +1,6 @@
package com.mzl.flower.service.impl.coupon;

import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,10 +17,13 @@
import com.mzl.flower.mapper.customer.CustomerMapper;
import com.mzl.flower.service.coupon.CouponRecordService;
import com.mzl.flower.service.coupon.CouponTemplateService2;
import com.mzl.flower.service.customer.CustomerService;
import com.mzl.flower.service.system.UserService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -28,6 +32,7 @@
import java.time.LocalDateTime;
import java.time.temporal.TemporalAdjusters;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

/**
@@ -54,26 +59,40 @@
    @Autowired
    private CustomerMapper customerMapper;

    @Autowired
    private CustomerService customerService;



    @Override
    public List<CouponRecordVO> getList(QueryCouponRecordDTO dto) {
        return couponRecordMapperCustom.getList(dto);
    }

    @Autowired
    RedissonClient redissonClient;

    private static final String COUPON_KEY="com:mzl:flower:service:impl:coupon:%s";

    @Transactional
    @Override
    public boolean createCouponRecord(CreateCouponRecordDTO dto) {

        // TODO 需要控制超领

        final Customer customer = customerMapper.selectById(dto.getCustomerId());
        if(null==customer){
            throw new ValidationException("商户信息不存在");
        }

        final CouponTemplateDO couponTemplateDO = couponTemplateService.getById(dto.getCouponId());
        if(couponTemplateDO==null){
            throw new ValidationException("优惠券不存在");
        }

        final Customer customer = customerMapper.selectById(dto.getCustomerId());
        if(null==customer){
            throw new ValidationException("商户信息不存在");
        }

        RLock lock = redissonClient.getLock(String.format(COUPON_KEY, couponTemplateDO.getId()));
        try {
            // 获取锁，最多等待 10 秒，锁自动释放时间 30 秒
            if (lock.tryLock(10, 30, TimeUnit.SECONDS)) {
                try {
        // 活动优惠券和积分优惠券需要根据库存来控制- 根据优惠券的发放数量来控制有没有超发
        if(StringUtils.isNotBlank(couponTemplateDO.getCategory()) && (
                couponTemplateDO.getCategory().equals(CouponCategoryEnum.ACTIVITY.getStatus()) || couponTemplateDO.getCategory().equals(CouponCategoryEnum.POINT.getStatus())
@@ -168,6 +187,18 @@
        }

        return baseMapper.insert(couponRecordDO)>0;

                } finally {
                    lock.unlock();
                }
            }
        } catch (InterruptedException e) {
            Thread.currentThread().interrupt();
            // 处理异常
        }

        return false;

    }

    @Override
@@ -216,58 +247,60 @@
    @Override
    public boolean grantVipCouponRecordList() {

        // TODO 会员等级修改
//        try{
//            LocalDateTime now = LocalDateTime.now();
//            LocalDateTime firstDayStart = now.with(TemporalAdjusters.firstDayOfMonth()).withHour(0).withMinute(0).withSecond(0).withNano(0);
//            LocalDateTime lastDayEnd = now.with(TemporalAdjusters.lastDayOfMonth()).withHour(23).withMinute(59).withSecond(59).withNano(0);
//
//            // 获取所有会员模版列表
//            List<CouponTemplateDO> vipTemplateList= couponTemplateService.getVipCouponTemplate();
//
//            // 遍历所有相同等级用户信息，并根据优惠券设置的规则构造优惠券
//            final List<CouponTemplateDO> updateCouponTemplateList = vipTemplateList.stream().map(couponTemplateDO -> {
//                final List<User> vipGradeUserList = userService.getVipGradeUserList(couponTemplateDO.getVipGrade());
//                final List<CouponRecordDO> gradeCouponRecordList = vipGradeUserList.stream().map(user -> {
//                    CouponRecordDO couponRecordDO = new CouponRecordDO();
//                    BeanUtils.copyProperties(couponTemplateDO, couponRecordDO);
//                    couponRecordDO.setId(IdUtil.simpleUUID());
//                    couponRecordDO.setCouponId(couponTemplateDO.getId());
//                    couponRecordDO.setUserId(user.getId());
//                    couponRecordDO.setStatus(CouponUsedStatusEnum.UNUSED.getType());
//                    couponRecordDO.setEffectiveStart(firstDayStart);
//                    couponRecordDO.setEffectiveEnd(lastDayEnd);
//
//                    // 创建信息
//                    couponRecordDO.create();
//                    return couponRecordDO;
//                }).collect(Collectors.toList());
//
//                // 批量保存等级下的优惠券信息
//                saveBatch(gradeCouponRecordList);
//
//                couponTemplateDO.setUsageStartDate(firstDayStart);
//                couponTemplateDO.setUsageEndDate(lastDayEnd);
//                couponTemplateDO.setGetStartDate(firstDayStart);
//                couponTemplateDO.setGetEndDate(lastDayEnd);
//
//                // 设置默认类型固定
//                couponTemplateDO.setUsageType(CouponUsageTypeEnum.FIXED.getType());
//
//                return couponTemplateDO;
//
//            }).collect(Collectors.toList());
//
//            // 批量更新原模版时间
//            couponTemplateService.updateBatchById(updateCouponTemplateList);
//
//            return true;
//        }catch (Exception e){
//            // 报错日志信息报错
//            log.error(e.getMessage());
//            return false;
//        }
        try{
            LocalDateTime now = LocalDateTime.now();
            LocalDateTime firstDayStart = now.with(TemporalAdjusters.firstDayOfMonth()).withHour(0).withMinute(0).withSecond(0).withNano(0);
            LocalDateTime lastDayEnd = now.with(TemporalAdjusters.lastDayOfMonth()).withHour(23).withMinute(59).withSecond(59).withNano(0);

            // 获取所有会员模版列表
            List<CouponTemplateDO> vipTemplateList= couponTemplateService.getVipCouponTemplate();

            // 遍历所有相同等级用户信息，并根据优惠券设置的规则构造优惠券
            final List<CouponTemplateDO> updateCouponTemplateList = vipTemplateList.stream().map(couponTemplateDO -> {
                // 获取当前等级下的所有用户
                final List<Customer> customerList = customerService.getCustomerListByLevelId(couponTemplateDO.getMemberId());

                final List<CouponRecordDO> gradeCouponRecordList = customerList.stream().map(customer -> {
                    CouponRecordDO couponRecordDO = new CouponRecordDO();
                    BeanUtils.copyProperties(couponTemplateDO, couponRecordDO);
                    couponRecordDO.setId(IdUtil.simpleUUID());
                    couponRecordDO.setCouponId(couponTemplateDO.getId());
                    couponRecordDO.setUserId(customer.getUserId());
                    couponRecordDO.setCustomerId(customer.getId());
                    couponRecordDO.setStatus(CouponUsedStatusEnum.UNUSED.getType());
                    couponRecordDO.setEffectiveStart(firstDayStart);
                    couponRecordDO.setEffectiveEnd(lastDayEnd);
                    couponRecordDO.setMemberId(couponTemplateDO.getMemberId());

                    // 创建信息
                    couponRecordDO.create();
                    return couponRecordDO;
                }).collect(Collectors.toList());

                // 批量保存等级下的优惠券信息
                saveBatch(gradeCouponRecordList);

                couponTemplateDO.setUsageStartDate(firstDayStart);
                couponTemplateDO.setUsageEndDate(lastDayEnd);
                couponTemplateDO.setGetStartDate(firstDayStart);
                couponTemplateDO.setGetEndDate(lastDayEnd);

                // 设置默认类型固定
                couponTemplateDO.setUsageType(CouponUsageTypeEnum.FIXED.getType());

                return couponTemplateDO;

            }).collect(Collectors.toList());

            // 批量更新原模版时间
            couponTemplateService.updateBatchById(updateCouponTemplateList);

            return true;
        }catch (Exception e){
            // 报错日志信息报错
            log.error(e.getMessage());
        return false;
        }
    }

    @Override
@@ -350,6 +383,16 @@

    @Override
    public List<CouponRecordVO> getMineCouponRecordList(QueryMineCouponRecordDTO dto) {
        checkCouponExpired(dto);
        return couponRecordMapperCustom.getMineCouponRecordList(dto);
    }

    @Override
    public void checkCouponExpired(QueryMineCouponRecordDTO dto) {
        if(StringUtils.isBlank(dto.getUserId())){
            dto.setUserId(SecurityUtils.getUserId());
        }
        // 将未使用的优惠券直接过期
        couponRecordMapperCustom.checkCouponExpired(dto);
    }
}

 src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateAppController.java

@@ -91,7 +91,6 @@

        return returnData(R.SUCCESS.getCode(), ConverterUtil.transList(couponRecordService.getMineCouponRecordList(dto), CouponTemplateAppVO.class));


    }
    @GetMapping("/mine/used/list")
    @ApiOperation(value = "我的优惠券-已使用", notes = "我的优惠券-已使用")
@@ -113,9 +112,6 @@
        return returnData(R.SUCCESS.getCode(), ConverterUtil.transList(couponRecordService.getMineCouponRecordList(dto), CouponTemplateAppVO.class));

    }





}

 src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml

@@ -31,6 +31,15 @@
        <result column="order_no" property="orderNo" />

    </resultMap>
    <update id="checkCouponExpired">
        update t_coupon_record set `status`='expired' where `status`='unused' and effective_end &lt; NOW()
        <if test="param.userId != null and param.userId != ''">
            AND t.user_id = #{param.userId}
        </if>
        <if test="param.customerId != null and param.customerId != ''">
            AND t.customer_id =  #{param.customerId}
        </if>
    </update>

    <select id="statisCouponTemplateCount" resultType="java.lang.Integer">
        select IFNULL(count(1),0) as cnt from t_coupon_record where deleted=false and category=#{param.category}