KKSU
2023-11-24 1c59b84d5320fba3c450d932f24a9fdc52830420
匹配
2 files modified
19 ■■■■■ changed files
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java 14 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -15,6 +15,8 @@
import cc.mrbird.febs.mall.vo.*;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -249,6 +251,18 @@
        mallMemberVo.setFcmCntFrozen(mallMemberAmount.getFcmCntFrozen());
        mallMemberVo.setTokenAva(mallMemberAmount.getTokenAva());
        mallMemberVo.setTokenFrozen(mallMemberAmount.getTokenFrozen());
        DataDictionaryCustom startTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.YU_YUE_START_TIME.getType(),
                DataDictionaryEnum.YU_YUE_START_TIME.getCode()
        );
        DateTime startTime = cn.hutool.core.date.DateUtil.parseTime(startTimeDic.getValue());
        mallMemberVo.setStartTime(startTime);
        DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.YU_YUE_END_TIME.getType(),
                DataDictionaryEnum.YU_YUE_END_TIME.getCode()
        );
        DateTime endTime = DateUtil.parseTime(endTimeDic.getValue());
        mallMemberVo.setEndTime(endTime);
        return new FebsResponse().success().data(mallMemberVo);
    }
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.vo;
import cn.hutool.core.date.DateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -85,5 +86,9 @@
    private BigDecimal outFcmFee;//FCM提现收续费
    @ApiModelProperty(value = "FCM价格")
    private BigDecimal fcmPrice;//FCM价格
    @ApiModelProperty(value = "预约开始时间")
    private Date startTime;//FCM价格
    @ApiModelProperty(value = "预约结束时间")
    private Date endTime;//FCM价格
}