From 571656e46da7563226b4132d2a6c62658300cd1d Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 06 Mar 2024 11:30:13 +0800
Subject: [PATCH] 抽奖

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java |   52 ++++++++++++++++++++++++++--------------------------
 1 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java
index f177300..e55217d 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java
@@ -649,34 +649,34 @@
         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);
-//                }
-//            }
-//        }
-
-        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())){
+                for(ApiOrderRecordListVo apiOrderListVo : apiOrderListVoIPageBuy.getRecords()){
+                    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())){

--
Gitblit v1.9.1