From 56c7e8bcb5e8e020d28c642260a1cadb681be4bb Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 04 Jan 2024 11:49:48 +0800
Subject: [PATCH] 团队列表
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java | 66 +++++++++++++++++++++-----------
1 files changed, 43 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 42b7034..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
@@ -17,9 +17,11 @@
import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.crypto.SecureUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -30,6 +32,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@Slf4j
@@ -65,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;
@@ -95,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("请输入正确的交易密码");
}
@@ -123,6 +127,13 @@
memberId,productNFTId,ProductEnum.PRODUCT_BUY_ON_GOING.getValue(),ProductEnum.PRODUCT_BUY_MATE_STATE_FAIL.getValue());
if(ObjectUtil.isNotEmpty(mallProductBuy)){
throw new FebsException("不可重复预约");
+ }
+ QueryWrapper<MallProductBuy> mallProductBuyDone = new QueryWrapper<>();
+ mallProductBuyDone.like("CREATED_TIME", DateUtil.today());
+ mallProductBuyDone.eq("member_id",memberId);
+ Integer selectCount = mallProductBuyMapper.selectCount(mallProductBuyDone);
+ if(0 < selectCount){
+ throw new FebsException("每日预约一次");
}
BigDecimal priceToken = mallProductNft.getPriceToken();
@@ -497,6 +508,15 @@
mallMember.getId(),
FlowTypeNewEnum.NFT.getValue(),
MoneyFlowTypeNewEnum.PAY.getDescrition());
+
+ DataDictionaryCustom insureMinuteDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.INSURE_END_MINUTE.getType(),
+ DataDictionaryEnum.INSURE_END_MINUTE.getCode()
+ );
+ Integer insureMinute = Integer.parseInt(ObjectUtil.isEmpty(insureMinuteDic) ? "60" : insureMinuteDic.getValue());
+ Date endTime = DateUtil.offsetMinute(payTime, insureMinute);
+ long remainTime = DateUtil.between(payTime, endTime, DateUnit.SECOND, false);
+ agentProducer.sendFcmPayBuyTimeTTLMsg(mallProductSellRecord.getId(), remainTime * 1000L);
return new FebsResponse().success();
}
--
Gitblit v1.9.1