From 6fd29ed2b9d1eac17af62a61dd2129f8b937dd2b Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 04 Jan 2024 11:48:04 +0800
Subject: [PATCH] 团队列表
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 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 f3d9fea..1d12048 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
@@ -68,15 +68,16 @@
List<ApiMallProductNftVo> list = this.baseMapper.selectByState(ProductEnum.PRODUCT_NFT_OPEN.getValue());
if(CollUtil.isNotEmpty(list)){
for(ApiMallProductNftVo apiMallProductNftVo : list){
- if(nowTime.compareTo(startTime) < 0){
- apiMallProductNftVo.setYuYueState(1);
- }
- if(nowTime.compareTo(startTime) >= 0 && nowTime.compareTo(endTime) <= 0){
- apiMallProductNftVo.setYuYueState(2);
- }
- if(nowTime.compareTo(endTime) > 0){
- apiMallProductNftVo.setYuYueState(3);
- }
+ apiMallProductNftVo.setYuYueState(2);
+// if(nowTime.compareTo(startTime) < 0){
+// apiMallProductNftVo.setYuYueState(1);
+// }
+// if(nowTime.compareTo(startTime) >= 0 && nowTime.compareTo(endTime) <= 0){
+// apiMallProductNftVo.setYuYueState(2);
+// }
+// if(nowTime.compareTo(endTime) > 0){
+// apiMallProductNftVo.setYuYueState(3);
+// }
}
}
return list;
@@ -98,20 +99,20 @@
throw new FebsException("用户已冻结");
}
- 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)){
- throw new FebsException("预约未开始");
- }
+// 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)){
+// throw new FebsException("预约未开始");
+// }
if(!tradePassword.equals(mallMember.getTradePassword())){
throw new FebsException("请输入正确的交易密码");
}
--
Gitblit v1.9.1