KKSU
2024-02-23 b113b572ac01c1a799e3b87d5307f34a93b88df8
抽奖
3 files modified
27 ■■■■■ changed files
src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java 21 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/AdminMallProductBuyVo.java 4 ●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/news/productBuyListNew.html 2 ●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java
@@ -2,6 +2,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.enumerates.FlowTypeNewEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeNewEnum;
import cc.mrbird.febs.common.enumerates.ProductEnum;
@@ -54,6 +55,7 @@
    private final IMallMoneyFlowService mallMoneyFlowService;
    private final AgentProducer agentProducer;
    private final MallMemberSpeakMapper mallMemberSpeakMapper;
    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
    @Override
    public IPage<AdminMallNewsInfoVo> getNewInfoList(MallNewsInfo mallNewsInfo, QueryRequest request) {
@@ -207,6 +209,25 @@
    public IPage<AdminMallProductBuyVo> getBuyList(MallProductBuy mallProductBuy, QueryRequest request) {
        Page<AdminMallProductBuyVo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<AdminMallProductBuyVo> adminMallProductBuyVoIPage = mallProductNftMapper.getBuyList(page, mallProductBuy);
        DateTime nowTime = DateUtil.parseTime(DateUtil.formatTime(DateUtil.date()));
        DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.YU_YUE_END_TIME.getType(),
                DataDictionaryEnum.YU_YUE_END_TIME.getCode()
        );
        DateTime endTime = DateUtil.parseTime(endTimeDic.getValue());
        /**
         * 当前时间比结束时间大
         */
        List<AdminMallProductBuyVo> records = adminMallProductBuyVoIPage.getRecords();
        if(CollUtil.isNotEmpty(records)){
            for(AdminMallProductBuyVo adminMallProductBuyVo :records){
                if(nowTime.compareTo(endTime) >= 0){
                    adminMallProductBuyVo.setButtonState(0);
                }else{
                    adminMallProductBuyVo.setButtonState(1);
                }
            }
        }
        return adminMallProductBuyVoIPage;
    }
src/main/java/cc/mrbird/febs/mall/vo/AdminMallProductBuyVo.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.mall.vo;
import cc.mrbird.febs.mall.entity.MallProductBuyRecord;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -24,4 +25,7 @@
    private BigDecimal nftAva;//nft分配额度
    private Date orderTime;//匹配时间
    private Date payTime;//支付时间
    //1-显示 0-不显示
    private Integer buttonState;
}
src/main/resources/templates/febs/views/modules/news/productBuyListNew.html
@@ -267,7 +267,7 @@
                    {templet: '#isBuyMateState', title: '匹配状态', minWidth: 100,align:'center'},
                    {title: '操作',
                        templet: function (d) {
                            if(d.state == 1){
                            if(d.state == 1 && d.buttonState == 1){
                                return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="productSellPick" shiro:hasPermission="user:update">手动匹配</button>'
                            }else{
                                return ''