ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
@@ -74,7 +74,7 @@ List<AuctionBrowseRecord> list = this.list(wrapper3); for (AuctionBrowseRecord auctionBrowseRecord:list){ AuctionGoods auctionGoods = auctionGoodsMapper.selectById(auctionBrowseRecord.getTargetId()); goodsSkuIdList.add(auctionGoods.getGoodsSkuId()); goodsSkuIdList.add(auctionBrowseRecord.getTargetId()); } Set<Long> goodsSkuIdList1 = null; if (StringUtils.isNotEmpty(auctionGoodsListDTO.getGoodsSkuName())) { @@ -136,7 +136,6 @@ LambdaQueryWrapper<AuctionBrowseRecord> wrapper3= Wrappers.lambdaQuery(); wrapper3.eq(AuctionBrowseRecord::getDelFlag,0); wrapper3.eq(AuctionBrowseRecord::getTargetId,MemberAuctionSalesroomDTO.getAuctionSalesroomId()); wrapper3.eq(AuctionBrowseRecord::getMemberId,MemberAuctionSalesroomDTO.getMemberId()); wrapper3.eq(AuctionBrowseRecord::getBrowseType,2); wrapper3.ge(AuctionBrowseRecord::getCreateTime, newTime7) @@ -150,7 +149,7 @@ page.setSize(MemberAuctionSalesroomDTO.getPageSize()); page.setCurrent(MemberAuctionSalesroomDTO.getPageCurr()); MemberAuctionSalesroomWdDTO memberAuctionSalesroomWdDTO=new MemberAuctionSalesroomWdDTO(); if (goodsSkuIdList!=null){ if (goodsSkuIdList.size()>0){ memberAuctionSalesroomWdDTO.setGoodsSkuIdList(goodsSkuIdList); }else{ goodsSkuIdList=new HashSet<>(); ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsSkuController.java
@@ -57,6 +57,4 @@ public R<List<getHomeGoodsSkuXxiVO>> getMsHomeGoodsSkuXxi(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO) { return R.ok(iGoodsSkuService.getMsHomeGoodsSkuXxi(homeGoodsSkuDTO)); } } ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/MemberGoodsCollectionController.java
@@ -183,7 +183,7 @@ WxMaTemplateData data3 = new WxMaTemplateData("thing4", startTime.format(formatter)); WxMaTemplateData data4 = new WxMaTemplateData("thing5","秒杀活动开始啦，快来抢购"); WxMaTemplateData data4 = new WxMaTemplateData("thing5","优质老酒限时秒杀即将开始！点击参与秒杀哈"); templateDataList.add(data1);
@@ -503,8 +503,8 @@ wrapper4.eq(GoodsBrowseRecord::getDelFlag,0); wrapper4.eq(GoodsBrowseRecord::getGoodsSkuId,homeGoodsSkuDTO.getGoodsSkuId()); wrapper4.eq(GoodsBrowseRecord::getMemberId,homeGoodsSkuDTO.getMemberId()); wrapper4.ge(GoodsBrowseRecord::getCreateTime, now) .le(GoodsBrowseRecord::getCreateTime, newTime7); wrapper4.ge(GoodsBrowseRecord::getCreateTime, newTime7) .le(GoodsBrowseRecord::getCreateTime,now ); List<GoodsBrowseRecord> list1 = iGoodsBrowseRecordService.list(wrapper4); if (list1.size()==0){ GoodsBrowseRecord auctionBrowseRecord=new GoodsBrowseRecord();
