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 | 251 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 198 insertions(+), 53 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 ed4476f..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
@@ -46,6 +49,7 @@
private final MallProductSellMapper mallProductSellMapper;
private final MallProductSellRecordMapper mallProductSellRecordMapper;
private final MallProductBuyRecordMapper mallProductBuyRecordMapper;
+ private final MallMemberSpeakMapper mallMemberSpeakMapper;
@Override
public List<ApiMallProductNftVo> productNFTList() {
@@ -64,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;
@@ -94,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("请输入正确的交易密码");
}
@@ -122,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();
@@ -281,21 +293,23 @@
BigDecimal nftFeePercent = ObjectUtil.isEmpty(nftFeeDic) ? new BigDecimal(20) : new BigDecimal(nftFeeDic.getValue());
nftFeePercent = nftFeePercent.divide(new BigDecimal(100),4,BigDecimal.ROUND_DOWN);
BigDecimal nftFee = nftCnt.multiply(nftFeePercent);
- BigDecimal nftCntAva = nftCnt.subtract(nftFee);
-
DataDictionaryCustom fcmPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.FCM_PRICE.getType(),
DataDictionaryEnum.FCM_PRICE.getCode());
BigDecimal fcmPrice = ObjectUtil.isEmpty(fcmPriceDic) ? new BigDecimal(2) : new BigDecimal(fcmPriceDic.getValue());
BigDecimal fcmFeeCnt = nftFee.divide(fcmPrice, 2, BigDecimal.ROUND_DOWN);
+ if(BigDecimal.ZERO.compareTo(mallMemberAmount.getTrendsNft()) >= 0
+ || fcmFeeCnt.compareTo(mallMemberAmount.getFcmCntAva()) > 0){
+ throw new FebsException("手续费不足");
+ }
String orderNo = MallUtils.getOrderNum("NFT");
MallProductSell mallProductSell = new MallProductSell();
mallProductSell.setMemberId(memberId);
mallProductSell.setOrderNo(orderNo);
mallProductSell.setNftTotal(nftCnt);
- mallProductSell.setNftCnt(nftCntAva);
- mallProductSell.setNftCntAva(nftCntAva);
+ mallProductSell.setNftCnt(nftCnt);
+ mallProductSell.setNftCntAva(nftCnt);
mallProductSell.setNftFee(nftFee);
mallProductSell.setFcmFee(fcmFeeCnt);
mallProductSell.setState(ProductEnum.PRODUCT_SELL_ON_GOING.getValue());
@@ -309,7 +323,7 @@
mallMemberAmountMapper.updateFcmCntAvaById(mallMemberAmountFcm);
MallMemberAmount mallMemberAmountFrozenNFT = mallMemberAmountMapper.selectByMemberId(memberId);
- mallMemberAmountFrozenNFT.setFrozenNft(mallMemberAmountFrozenNFT.getFrozenNft().add(nftCntAva));
+ mallMemberAmountFrozenNFT.setFrozenNft(mallMemberAmountFrozenNFT.getFrozenNft().add(nftCnt));
mallMemberAmountMapper.updateFrozenNftById(mallMemberAmountFrozenNFT);
iMallMoneyFlowService.addMoneyFlow(
memberId,
@@ -327,15 +341,6 @@
mallMember.getId(),
FlowTypeNewEnum.FCM_COIN.getValue(),
MoneyFlowTypeNewEnum.NFT_OUT_FEE_FCM.getDescrition());
- iMallMoneyFlowService.addMoneyFlow(
- memberId,
- nftFee.negate(),
- MoneyFlowTypeNewEnum.NFT_OUT_FEE.getValue(),
- orderNo,
- mallMember.getId(),
- FlowTypeNewEnum.NFT.getValue(),
- MoneyFlowTypeNewEnum.NFT_OUT_FEE.getDescrition());
-
agentProducer.sendFcmNFTExchangeMsg(fcmFeeCnt.toString());
return new FebsResponse().success();
}
@@ -369,24 +374,41 @@
);
DateTime endTime = DateUtil.parseTime(endTimeDic.getValue());
if(nowTime.compareTo(startTime) >= 0 && nowTime.compareTo(endTime) <= 0){
- //买单
- if(2 == orderType){
- IPage<ApiOrderListVo> page = new Page<>(apiOrderListDto.getPageNum(), apiOrderListDto.getPageSize());
- IPage<ApiOrderListVo> apiOrderListVoIPageBuy = mallProductBuyMapper.selectListInPage(page, apiOrderListDto);
- if(CollUtil.isNotEmpty(apiOrderListVoIPageBuy.getRecords())){
- for(ApiOrderListVo apiOrderListVo : apiOrderListVoIPageBuy.getRecords()){
- objects.add(apiOrderListVo);
- }
+// //买单
+// if(2 == orderType){
+// IPage<ApiOrderListVo> page = new Page<>(apiOrderListDto.getPageNum(), apiOrderListDto.getPageSize());
+// IPage<ApiOrderListVo> apiOrderListVoIPageBuy = mallProductBuyMapper.selectListInPage(page, apiOrderListDto);
+// if(CollUtil.isNotEmpty(apiOrderListVoIPageBuy.getRecords())){
+// for(ApiOrderListVo apiOrderListVo : apiOrderListVoIPageBuy.getRecords()){
+// objects.add(apiOrderListVo);
+// }
+// }
+// }
+// //卖单
+// if(1 == orderType){
+// IPage<ApiOrderListVo> page = new Page<>(apiOrderListDto.getPageNum(), apiOrderListDto.getPageSize());
+// IPage<ApiOrderListVo> apiOrderListVoIPageSell = mallProductSellMapper.selectListInPage(page, apiOrderListDto);
+// if(CollUtil.isNotEmpty(apiOrderListVoIPageSell.getRecords())){
+// for(ApiOrderListVo apiOrderListVo : apiOrderListVoIPageSell.getRecords()){
+// objects.add(apiOrderListVo);
+// }
+// }
+// }
+
+ IPage<ApiOrderListVo> pageBuy = new Page<>(apiOrderListDto.getPageNum(), apiOrderListDto.getPageSize());
+ IPage<ApiOrderListVo> apiOrderListVoIPageBuy = mallProductBuyMapper.selectListInPage(pageBuy, apiOrderListDto);
+ if(CollUtil.isNotEmpty(apiOrderListVoIPageBuy.getRecords())){
+ for(ApiOrderListVo apiOrderListVo : apiOrderListVoIPageBuy.getRecords()){
+ objects.add(apiOrderListVo);
}
}
- //卖单
- if(1 == orderType){
- IPage<ApiOrderListVo> page = new Page<>(apiOrderListDto.getPageNum(), apiOrderListDto.getPageSize());
- IPage<ApiOrderListVo> apiOrderListVoIPageSell = mallProductSellMapper.selectListInPage(page, apiOrderListDto);
- if(CollUtil.isNotEmpty(apiOrderListVoIPageSell.getRecords())){
- for(ApiOrderListVo apiOrderListVo : apiOrderListVoIPageSell.getRecords()){
- objects.add(apiOrderListVo);
- }
+
+
+ IPage<ApiOrderListVo> pageSell = new Page<>(apiOrderListDto.getPageNum(), apiOrderListDto.getPageSize());
+ IPage<ApiOrderListVo> apiOrderListVoIPageSell = mallProductSellMapper.selectListInPage(pageSell, apiOrderListDto);
+ if(CollUtil.isNotEmpty(apiOrderListVoIPageSell.getRecords())){
+ for(ApiOrderListVo apiOrderListVo : apiOrderListVoIPageSell.getRecords()){
+ objects.add(apiOrderListVo);
}
}
}
@@ -486,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();
}
@@ -554,4 +585,118 @@
}
return false;
}
+
+ @Override
+ public FebsResponse orderSellComplain(ApiOrderSellComplainDto apiOrderSellComplainDto) {
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ Long sellRecordId = apiOrderSellComplainDto.getSellRecordId();
+ Integer orderType = apiOrderSellComplainDto.getOrderType();
+ String buyOrderNo = null;
+ if(orderType == 1){
+
+ MallProductSellRecord mallProductSellRecord = mallProductSellRecordMapper.selectById(sellRecordId);
+ if(ObjectUtil.isEmpty(mallProductSellRecord)){
+ throw new FebsException("记录不存在");
+ }
+ MallProductBuyRecord mallProductBuyRecord = mallProductBuyRecordMapper.selectById(mallProductSellRecord.getBuyRecordId());
+ if(ObjectUtil.isEmpty(mallProductBuyRecord)){
+ throw new FebsException("记录不存在");
+ }
+
+ mallProductBuyRecord.setState(ProductEnum.PRODUCT_MATE_STATE_COMPLAIN.getValue());
+ mallProductBuyRecordMapper.updateById(mallProductBuyRecord);
+
+ mallProductSellRecord.setState(ProductEnum.PRODUCT_MATE_STATE_COMPLAIN.getValue());
+ mallProductSellRecordMapper.updateById(mallProductSellRecord);
+ buyOrderNo = mallProductBuyRecord.getBuyOrderNo();
+ }
+ if(orderType == 2){
+ MallProductBuyRecord mallProductBuyRecord = mallProductBuyRecordMapper.selectById(sellRecordId);
+ if(ObjectUtil.isEmpty(mallProductBuyRecord)){
+ throw new FebsException("记录不存在");
+ }
+
+ MallProductSellRecord mallProductSellRecord = mallProductSellRecordMapper.selectById(mallProductBuyRecord.getSellRecordId());
+ if(ObjectUtil.isEmpty(mallProductSellRecord)){
+ throw new FebsException("记录不存在");
+ }
+
+
+ mallProductBuyRecord.setState(ProductEnum.PRODUCT_MATE_STATE_COMPLAIN.getValue());
+ mallProductBuyRecordMapper.updateById(mallProductBuyRecord);
+
+ mallProductSellRecord.setState(ProductEnum.PRODUCT_MATE_STATE_COMPLAIN.getValue());
+ mallProductSellRecordMapper.updateById(mallProductSellRecord);
+ buyOrderNo = mallProductBuyRecord.getBuyOrderNo();
+
+ }
+
+ MallMemberSpeak mallMemberSpeak = new MallMemberSpeak();
+ mallMemberSpeak.setMemberId(memberId);
+ mallMemberSpeak.setState(ProductEnum.SPEAK_NO_DEAL.getValue());
+ String description = apiOrderSellComplainDto.getDescription();
+ mallMemberSpeak.setDescription("编号："+buyOrderNo+","+description);
+ mallMemberSpeakMapper.insert(mallMemberSpeak);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse orderRecordList(ApiOrderRecordListDto apiOrderListDto) {
+ 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> pageSell = new Page<>(apiOrderListDto.getPageNum(), apiOrderListDto.getPageSize());
+ IPage<ApiOrderRecordListVo> apiOrderListVoIPageSell = mallProductSellRecordMapper.selectListInPage(pageSell, apiOrderListDto);
+ if(CollUtil.isNotEmpty(apiOrderListVoIPageSell.getRecords())){
+ for(ApiOrderRecordListVo apiOrderListVo : apiOrderListVoIPageSell.getRecords()){
+ objects.add(apiOrderListVo);
+ }
+ }
+
+ return new FebsResponse().success().data(objects);
+ }
+
+ @Override
+ public FebsResponse orderSellRecord(ApiOrderSellInfoDto apiOrderSellInfoDto) {
+ Long productSellRecordId = apiOrderSellInfoDto.getId();
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ MallProductSellRecord mallProductSellRecord = mallProductSellRecordMapper.selectById(productSellRecordId);
+ if(ObjectUtil.isEmpty(mallProductSellRecord)){
+ throw new FebsException("记录不存在");
+ }
+ ApiOrderSellRecordInfoVo apiOrderSellRecordInfoVo = mallProductSellRecordMapper.selectBySellRecordId(productSellRecordId);
+ return new FebsResponse().success().data(apiOrderSellRecordInfoVo);
+ }
+
+ @Override
+ public FebsResponse orderBuyRecord(ApiOrderBuyInfoDto apiOrderBuyInfoDto) {
+ Long productBuyRecordId = apiOrderBuyInfoDto.getId();
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ MallProductBuyRecord mallProductBuyRecord = mallProductBuyRecordMapper.selectById(productBuyRecordId);
+ if(ObjectUtil.isEmpty(mallProductBuyRecord)){
+ throw new FebsException("记录不存在");
+ }
+ ApiOrderBuyRecordInfoVo apiOrderBuyRecordInfoVo = mallProductBuyRecordMapper.selectByBuyRecordId(productBuyRecordId);
+ return new FebsResponse().success().data(apiOrderBuyRecordInfoVo);
+ }
}
--
Gitblit v1.9.1