抽奖

KKSU

2024-03-06 571656e46da7563226b4132d2a6c62658300cd1d

抽奖

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

@@ -649,27 +649,18 @@
        Long memberId = LoginUserUtil.getLoginUser().getId();
        List<ApiOrderRecordListVo> objects = new ArrayList<>();
        apiOrderListDto.setMemberId(memberId);
//        DateTime nowTime = DateUtil.parseTime(DateUtil.formatTime(DateUtil.date()));
//        DataDictionaryCustom startTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
//                DataDictionaryEnum.YU_YUE_START_TIME.getType(),
//                DataDictionaryEnum.YU_YUE_START_TIME.getCode()
//        );
//        DateTime startTime = DateUtil.parseTime(startTimeDic.getValue());
//        DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
//                DataDictionaryEnum.YU_YUE_END_TIME.getType(),
//                DataDictionaryEnum.YU_YUE_END_TIME.getCode()
//        );
//        DateTime endTime = DateUtil.parseTime(endTimeDic.getValue());
//        if(nowTime.compareTo(startTime) >= 0 && nowTime.compareTo(endTime) <= 0){
//            IPage<ApiOrderRecordListVo> pageBuy = new Page<>(apiOrderListDto.getPageNum(), apiOrderListDto.getPageSize());
//            IPage<ApiOrderRecordListVo> apiOrderListVoIPageBuy = mallProductBuyRecordMapper.selectListInPage(pageBuy, apiOrderListDto);
//            if(CollUtil.isNotEmpty(apiOrderListVoIPageBuy.getRecords())){
//                for(ApiOrderRecordListVo apiOrderListVo : apiOrderListVoIPageBuy.getRecords()){
//                    objects.add(apiOrderListVo);
//                }
//            }
//        }

        DateTime nowTime = DateUtil.parseTime(DateUtil.formatTime(DateUtil.date()));
        DataDictionaryCustom startTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.YU_YUE_START_TIME.getType(),
                DataDictionaryEnum.YU_YUE_START_TIME.getCode()
        );
        DateTime startTime = DateUtil.parseTime(startTimeDic.getValue());
        DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.YU_YUE_END_TIME.getType(),
                DataDictionaryEnum.YU_YUE_END_TIME.getCode()
        );
        DateTime endTime = DateUtil.parseTime(endTimeDic.getValue());
        if(nowTime.compareTo(startTime) >= 0 && nowTime.compareTo(endTime) <= 0){
        IPage<ApiOrderRecordListVo> pageBuy = new Page<>(apiOrderListDto.getPageNum(), apiOrderListDto.getPageSize());
        IPage<ApiOrderRecordListVo> apiOrderListVoIPageBuy = mallProductBuyRecordMapper.selectListInPage(pageBuy, apiOrderListDto);
        if(CollUtil.isNotEmpty(apiOrderListVoIPageBuy.getRecords())){
@@ -677,6 +668,15 @@
                objects.add(apiOrderListVo);
            }
        }
        }

//        IPage<ApiOrderRecordListVo> pageBuy = new Page<>(apiOrderListDto.getPageNum(), apiOrderListDto.getPageSize());
//        IPage<ApiOrderRecordListVo> apiOrderListVoIPageBuy = mallProductBuyRecordMapper.selectListInPage(pageBuy, apiOrderListDto);
//        if(CollUtil.isNotEmpty(apiOrderListVoIPageBuy.getRecords())){
//            for(ApiOrderRecordListVo apiOrderListVo : apiOrderListVoIPageBuy.getRecords()){
//                objects.add(apiOrderListVo);
//            }
//        }
        IPage<ApiOrderRecordListVo> pageSell = new Page<>(apiOrderListDto.getPageNum(), apiOrderListDto.getPageSize());
        IPage<ApiOrderRecordListVo> apiOrderListVoIPageSell = mallProductSellRecordMapper.selectListInPage(pageSell, apiOrderListDto);
        if(CollUtil.isNotEmpty(apiOrderListVoIPageSell.getRecords())){