feat(signActivity): 添加签到日历和签到记录功能

Administrator

2025-05-08 24fe2b1c79d9836ebc61091e32367395b1b90c6b

feat(signActivity): 添加签到日历和签到记录功能

- 新增 ApiGetRunDateVo、ApiSignDataDto、ApiSignListDto 和 ApiSignListVo 类- 在 ApiScoreController 中添加签到日历和签到记录的 API 接口
- 在 IScoreService 接口中添加新的方法
- 在 ScoreServiceImpl 中实现签到日历和签到记录的逻辑
- 更新 ScoreSignVo 中的注释

 src/main/java/cc/mrbird/febs/mall/controller/signActivity/ApiScoreController.java

@@ -1,16 +1,20 @@
package cc.mrbird.febs.mall.controller.signActivity;

import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.mall.service.ICommonService;
import cc.mrbird.febs.mall.dto.MoneyFlowDto;
import cc.mrbird.febs.mall.dto.signActivity.ApiSignDataDto;
import cc.mrbird.febs.mall.dto.signActivity.ApiSignListDto;
import cc.mrbird.febs.mall.service.IScoreService;
import cc.mrbird.febs.mall.vo.MoneyFlowVo;
import cc.mrbird.febs.mall.vo.ScoreSignVo;
import cc.mrbird.febs.mall.vo.signActivity.ApiGetRunDateVo;
import cc.mrbird.febs.mall.vo.signActivity.ApiSignListVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@@ -28,7 +32,7 @@
public class ApiScoreController {

    private final IScoreService scoreService;
    @ApiOperation(value = "积分签到", notes = "积分签到")
    @ApiOperation(value = "积分签到头部", notes = "积分签到头部")
    @ApiResponses({
            @ApiResponse(code = 200, message = "success", response = ScoreSignVo.class)
    })
@@ -37,10 +41,28 @@
        return new FebsResponse().success().data(scoreService.scoreSign());
    }

    @ApiOperation(value = "积分签到日历", notes = "积分签到日历")
    @ApiResponses({
            @ApiResponse(code = 200, message = "success", response = ApiGetRunDateVo.class)
    })
    @PostMapping(value = "/signData")
    public FebsResponse signData(@RequestBody @Validated ApiSignDataDto dto) {
        return new FebsResponse().success().data(scoreService.signData(dto));
    }

    @ApiOperation(value = "签到", notes = "签到")
    @PostMapping(value = "/sign")
    public FebsResponse sign() {
        scoreService.sign();
        return new FebsResponse().success();
    }

    @ApiOperation(value = "签到记录")
    @ApiResponses({
            @ApiResponse(code = 200, message = "success", response = ApiSignListVo.class)
    })
    @PostMapping(value = "/signList")
    public FebsResponse signList(@RequestBody ApiSignListDto dto) {
        return scoreService.signList(dto);
    }
}

 src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowDto.java

@@ -19,13 +19,13 @@
    @ApiModelProperty(value = "页码", example = "1")
    private Integer pageNum;

    @ApiModelProperty(value = "类型 1-静态收益 2-直推奖 3-代理收益 4-排名收益 5-总监收益 6-社区点补 7-一代收益 8-提现 9-转增 10-支付 11-退款")
    @ApiModelProperty(value = "类型 14-签到")
    private Integer type;

    @ApiModelProperty(value = "类型 1-全部 2-支出 3-收入")
    private Integer inOrOut;

    @ApiModelProperty(value = "流水类型 1-余额 2-赠送积分 3-竞猜积分 4-佣金")
    @ApiModelProperty(value = "流水类型 1-余额 2-赠送积分 3-积分 4-佣金")
    private Integer flowType;

    @ApiModelProperty(hidden = true)

 src/main/java/cc/mrbird/febs/mall/dto/signActivity/ApiSignDataDto.java

New file
@@ -0,0 +1,16 @@
package cc.mrbird.febs.mall.dto.signActivity;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotBlank;

@Data
@ApiModel(value = "ApiSignDataDto", description = "参数类")
public class ApiSignDataDto {

    @NotBlank(message = "日期不能为空")
    @ApiModelProperty(value = "日期", example = "丽丽")
    private String dateStr;
}

 src/main/java/cc/mrbird/febs/mall/dto/signActivity/ApiSignListDto.java

New file
@@ -0,0 +1,24 @@
package cc.mrbird.febs.mall.dto.signActivity;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;

@Data
@ApiModel(value = "ApiSignListDto", description = "参数类")
public class ApiSignListDto {

    @NotNull(message = "页码不能为空")
    @ApiModelProperty(value = "页码", example = "1")
    private Integer pageNow;

    @NotNull(message = "每页数量不能为空")
    @ApiModelProperty(value = "每页数量", example = "10")
    private Integer pageSize;

    @ApiModelProperty(hidden = true)
    private Long memberId;

}

 src/main/java/cc/mrbird/febs/mall/service/IScoreService.java

@@ -1,13 +1,23 @@
package cc.mrbird.febs.mall.service;

import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.mall.dto.signActivity.ApiSignDataDto;
import cc.mrbird.febs.mall.dto.signActivity.ApiSignListDto;
import cc.mrbird.febs.mall.entity.MallScoreSignRecord;
import cc.mrbird.febs.mall.vo.ScoreSignVo;
import cc.mrbird.febs.mall.vo.signActivity.ApiGetRunDateVo;

import java.util.List;

public interface IScoreService {

    ScoreSignVo scoreSign();

    List<ApiGetRunDateVo> signData(ApiSignDataDto dto);

    void sign();

    MallScoreSignRecord judgeScoreIsContinuity(MallScoreSignRecord mallScoreSignRecord);

    FebsResponse signList(ApiSignListDto dto);
}

 src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java

@@ -1,34 +1,44 @@
package cc.mrbird.febs.mall.service.impl;

import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.mall.dto.ScoreSettingDto;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallMemberWallet;
import cc.mrbird.febs.mall.entity.MallScoreSignRecord;
import cc.mrbird.febs.mall.dto.signActivity.ApiSignDataDto;
import cc.mrbird.febs.mall.dto.signActivity.ApiSignListDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.mall.mapper.MallMemberWalletMapper;
import cc.mrbird.febs.mall.mapper.MallScoreSignRecordMapper;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
import cc.mrbird.febs.mall.service.IScoreService;
import cc.mrbird.febs.mall.vo.ApiActivityInfoVo;
import cc.mrbird.febs.mall.vo.ScoreSignVo;
import cn.hutool.core.date.DateField;
import cc.mrbird.febs.mall.vo.signActivity.ApiGetRunDateVo;
import cc.mrbird.febs.mall.vo.signActivity.ApiSignListVo;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.IntStream;

/**
 * @author wzy
@@ -71,6 +81,86 @@
    }

    @Override
    public List<ApiGetRunDateVo> signData(ApiSignDataDto dto) {
        Long memberId = LoginUserUtil.getLoginUser().getId();
        DateTime dateTime = DateUtil.parseDate(dto.getDateStr());

        DateTime startTime = DateUtil.beginOfMonth(dateTime);
        DateTime endTime = DateUtil.endOfMonth(dateTime);
        long between = DateUtil.between(startTime, endTime, DateUnit.DAY);
        List<ApiGetRunDateVo> apiGetRunDateVos = generateDateList(startTime, between);

        List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowService.getBaseMapper().selectList(
                new LambdaQueryWrapper<MallMoneyFlow>()
                        .eq(MallMoneyFlow::getMemberId, memberId)
                        .eq(MallMoneyFlow::getFlowType, FlowTypeEnum.PRIZE_SCORE.getValue())
                        .eq(MallMoneyFlow::getType, MoneyFlowTypeEnum.SCORE_SIGN.getValue())
                        .ge(MallMoneyFlow::getCreatedTime, startTime)
                        .le(MallMoneyFlow::getCreatedTime, endTime)
        );
        if(CollUtil.isNotEmpty(mallMoneyFlows)){
            calculateProfits(apiGetRunDateVos,mallMoneyFlows);
        }

        return apiGetRunDateVos;
    }

    /**
     * 生成日期列表
     *
     * @param startDate 开始日期
     * @param days      从开始日期算起的天数
     * @return 一个包含日期信息的ApiGetRunDateVo对象列表
     */
    private List<ApiGetRunDateVo> generateDateList(DateTime startDate, long days) {
        // 使用IntStream生成从0到days（包含days）的整数流，表示每一天
        return IntStream.range(0, (int) days + 1)
                // 将每个整数映射为一个ApiGetRunDateVo对象
                .mapToObj(i -> {
                    // 创建ApiGetRunDateVo对象
                    ApiGetRunDateVo apiGetRunDateVo = new ApiGetRunDateVo();
                    // 计算日期：从起始日期开始偏移i天
                    DateTime dateTime = DateUtil.offsetDay(startDate, i);
                    // 格式化日期为"yyyy-MM-dd"字符串，并设置到对象中
                    apiGetRunDateVo.setDateStr(DateUtil.format(dateTime, "yyyy-MM-dd"));
                    // 初始化碳积分为0
                    apiGetRunDateVo.setScore(BigDecimal.ZERO);
                    // 返回构建好的对象
                    return apiGetRunDateVo;
                })
                // 将流中的对象收集到一个列表中
                .collect(Collectors.toList());
    }
    /**
     * 计算每日累计碳积分
     *
     * @param dateList 日期列表，包含了每日的碳积分信息
     * @param mallMoneyFlows 商城资金流列表，包含了每笔碳积分信息
     */
    private void calculateProfits(List<ApiGetRunDateVo> dateList, List<MallMoneyFlow> mallMoneyFlows) {
        // 将日期列表转换为映射，以便通过日期快速访问每日碳积分信息
        Map<String, ApiGetRunDateVo> dateMap = dateList.stream()
                .collect(Collectors.toMap(ApiGetRunDateVo::getDateStr, vo -> vo));

        // 遍历mallMoneyFlows
        for (MallMoneyFlow item : mallMoneyFlows) {
            // 格式化当前项的创建时间，提取日期
            String date = DateUtil.format(item.getCreatedTime(), "yyyy-MM-dd");
            // 从日期映射中获取对应的每日碳积分信息
            ApiGetRunDateVo apiGetRunDateVo = dateMap.get(date);
            // 如果找到了对应的每日碳积分信息
            if (apiGetRunDateVo != null) {
                // 获取当前日期的碳积分
                BigDecimal score = apiGetRunDateVo.getScore();
                // 计算新的碳积分，将碳积分与碳积分相加，并向下取整到个位数
                BigDecimal profit = score.add(item.getAmount().abs()).setScale(0,BigDecimal.ROUND_DOWN);
                // 更新每日碳积分信息的利润值
                apiGetRunDateVo.setScore(profit);
            }
        }
    }

    @Override
    public MallScoreSignRecord judgeScoreIsContinuity(MallScoreSignRecord mallScoreSignRecord) {
        if (mallScoreSignRecord.getSignTime() == null) {
            return mallScoreSignRecord;
@@ -82,6 +172,35 @@
            mallScoreSignRecordMapper.updateById(mallScoreSignRecord);
        }
        return mallScoreSignRecord;
    }

    @Override
    public FebsResponse signList(ApiSignListDto dto) {

        Long memberId = LoginUserUtil.getLoginUser().getId();

        ArrayList<ApiSignListVo> apiSignListVos = new ArrayList<>();
        // 创建分页对象，传入当前页和每页大小
        Page<MallMoneyFlow> page = new Page<>(dto.getPageNow(), dto.getPageSize());
        LambdaQueryWrapper<MallMoneyFlow> mallMoneyFlowLambdaQueryWrapper = new LambdaQueryWrapper<>();
        mallMoneyFlowLambdaQueryWrapper
                .select(MallMoneyFlow::getCreatedTime, MallMoneyFlow::getAmount)
                .eq(MallMoneyFlow::getMemberId, memberId)
                .eq(MallMoneyFlow::getFlowType, FlowTypeEnum.PRIZE_SCORE.getValue())
                .eq(MallMoneyFlow::getType, MoneyFlowTypeEnum.SCORE_SIGN.getValue())
                .orderByDesc(MallMoneyFlow::getId)
        ;
        // 调用Mapper方法获取活动分页数据
        Page<MallMoneyFlow> mallMoneyFlowPage = mallMoneyFlowService.getBaseMapper().selectPage(page, mallMoneyFlowLambdaQueryWrapper);
        if(CollUtil.isNotEmpty(mallMoneyFlowPage.getRecords())){
            mallMoneyFlowPage.getRecords().forEach(item -> {
                ApiSignListVo apiSignListVo = new ApiSignListVo();
                apiSignListVo.setAmount(item.getAmount());
                apiSignListVo.setCreatedTime(item.getCreatedTime());
                apiSignListVos.add(apiSignListVo);
            });
        }
        return new FebsResponse().success().data(apiSignListVos);
    }

    @Override
@@ -169,6 +288,11 @@

        BigDecimal amount = BigDecimal.valueOf(mallScoreSignRecord.getScore());
        walletService.add(amount, member.getId(), "prizeScore");
        mallMoneyFlowService.addMoneyFlow(member.getId(), amount, MoneyFlowTypeEnum.SCORE_SIGN.getValue(), null, FlowTypeEnum.PRIZE_SCORE.getValue());
        mallMoneyFlowService.addMoneyFlow(
                member.getId(),
                amount,
                MoneyFlowTypeEnum.SCORE_SIGN.getValue(),
                null,
                FlowTypeEnum.PRIZE_SCORE.getValue());
    }
}

 src/main/java/cc/mrbird/febs/mall/vo/ScoreSignVo.java

@@ -13,7 +13,7 @@
@ApiModel(value = "ScoreSignVo", description = "积分签到返回参数接口")
public class ScoreSignVo {

    @ApiModelProperty(value = "我的竞猜积分")
    @ApiModelProperty(value = "我的积分")
    private Integer mineScore;

    @ApiModelProperty(value = "已连续签到")

 src/main/java/cc/mrbird/febs/mall/vo/signActivity/ApiGetRunDateVo.java

New file
@@ -0,0 +1,19 @@
package cc.mrbird.febs.mall.vo.signActivity;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
@ApiModel(value = "ApiGetRunDateVo", description = "信息返回类")
public class ApiGetRunDateVo {

    @ApiModelProperty(value = "获取到的签到积分  0-表示未签到")
    private BigDecimal score;

    @ApiModelProperty(value = "日期")
    private String dateStr;

}

 src/main/java/cc/mrbird/febs/mall/vo/signActivity/ApiSignListVo.java

New file
@@ -0,0 +1,22 @@
package cc.mrbird.febs.mall.vo.signActivity;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

@Data
@ApiModel(value = "ApiSignListVo", description = "信息返回类")
public class ApiSignListVo {

    @ApiModelProperty(value = "金额，有正负")
    private BigDecimal amount;

    @ApiModelProperty(value = "时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createdTime;

}