From 461588deea7f3a39f17d82736fa821414ed87c1c Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Sun, 04 Feb 2024 11:14:28 +0800 Subject: [PATCH] 确认收货更新用户的会员信息 --- src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 40 ++++++++-------------------------------- 1 files changed, 8 insertions(+), 32 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java index c18fd31..054a5e2 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java @@ -1049,30 +1049,6 @@ * 3、更新卖单子表的数据 */ agentProducer.sendFcmOrderBuyCancelMsg(mallProductBuyRecord.getId()); - -// Long buyId = mallProductBuyRecord.getBuyId(); -// Long sellRecordId = mallProductBuyRecord.getSellRecordId(); -// MallProductBuy mallProductBuy = mallProductBuyMapper.selectById(buyId); -// Long memberIdBuy = mallProductBuy.getMemberId(); -// //冻结账户 -// MallMember mallMemberBuy = memberMapper.selectById(memberIdBuy); -// mallMemberBuy.setIsFrozen(ProductEnum.MEMBER_FROZEN.getValue()); -// memberMapper.updateById(mallMemberBuy); -// //更新买单子表的数据 -// mallProductBuyRecord.setState(ProductEnum.PRODUCT_MATE_STATE_FAIL.getValue()); -// mallProductBuyRecordMapper.updateById(mallProductBuyRecord); -// //更新买单主表 -// mallProductBuy.setNftAva(mallProductBuy.getNftAva().add(mallProductBuyRecord.getPickNftCnt())); -// mallProductBuyMapper.updateById(mallProductBuy); -// //更新卖单子表的数据 -// MallProductSellRecord mallProductSellRecord = mallProductSellRecordMapper.selectById(sellRecordId); -// mallProductSellRecord.setState(ProductEnum.PRODUCT_MATE_STATE_FAIL.getValue()); -// mallProductSellRecordMapper.updateById(mallProductSellRecord); -// //更新卖单主表 -// Long sellId = mallProductSellRecord.getSellId(); -// MallProductSell mallProductSell = mallProductSellMapper.selectById(sellId); -// mallProductSell.setNftCntAva(mallProductSell.getNftCntAva().add(mallProductSellRecord.getNftCnt())); -// mallProductSellMapper.updateById(mallProductSell); } } } @@ -1119,12 +1095,12 @@ if(CollUtil.isEmpty(mallProductNfts)){ return; } - DateTime nowTime = DateUtil.parseTime(DateUtil.formatTime(DateUtil.date())); - DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode( - DataDictionaryEnum.YU_YUE_END_TIME.getType(), - DataDictionaryEnum.YU_YUE_END_TIME.getCode() - ); - DateTime endTime = DateUtil.parseTime(endTimeDic.getValue()); + DateTime nowTime = DateUtil.date(); +// DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode( +// DataDictionaryEnum.YU_YUE_END_TIME.getType(), +// DataDictionaryEnum.YU_YUE_END_TIME.getCode() +// ); +// DateTime endTime = DateUtil.parseTime(endTimeDic.getValue()); for(MallProductNft mallProductNft : mallProductNfts){ Long nftId = mallProductNft.getId(); List<MallProductBuy> mallProductBuys = mallProductBuyMapper.selectListByStateAndProductNFTId( @@ -1136,9 +1112,9 @@ } for(MallProductBuy mallProductBuy : mallProductBuys){ /** - * 当前时间比结束时间大 + * 当前时间比创建时间大 */ - if(nowTime.compareTo(endTime) >= 0){ + if(nowTime.compareTo(mallProductBuy.getCreatedTime()) >= 0){ /** * 返回令牌 * 预约记录超时 -- Gitblit v1.9.1