ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
@@ -150,7 +150,13 @@ page.setSize(MemberAuctionSalesroomDTO.getPageSize()); page.setCurrent(MemberAuctionSalesroomDTO.getPageCurr()); MemberAuctionSalesroomWdDTO memberAuctionSalesroomWdDTO=new MemberAuctionSalesroomWdDTO(); if (goodsSkuIdList!=null){ memberAuctionSalesroomWdDTO.setGoodsSkuIdList(goodsSkuIdList); }else{ goodsSkuIdList=new HashSet<>(); goodsSkuIdList.add(0L); memberAuctionSalesroomWdDTO.setGoodsSkuIdList(goodsSkuIdList); } memberAuctionSalesroomWdDTO.setSalesroomName(MemberAuctionSalesroomDTO.getSalesroomName()); List<AuctionSalesroom> auctionSalesroomList=auctionSalesroomMapper.pageMemberAuctionSalesroomWdList(page,memberAuctionSalesroomWdDTO); ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
@@ -527,6 +527,7 @@ LambdaQueryWrapper<AuctionBrowseRecord> wrapper3=Wrappers.lambdaQuery(); wrapper3.eq(AuctionBrowseRecord::getDelFlag,0); wrapper3.eq(AuctionBrowseRecord::getTargetId,auctionGoodsListDTO.getGoodsSkuId()); wrapper3.eq(AuctionBrowseRecord::getBrowseType,AuctionOrderTypeEnum.REGULAR_ITEMS); wrapper3.eq(AuctionBrowseRecord::getMemberId,auctionGoodsListDTO.getMemberId()); wrapper3.ge(AuctionBrowseRecord::getCreateTime, newTime7) .le(AuctionBrowseRecord::getCreateTime, now); ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -470,6 +470,7 @@ LambdaQueryWrapper<AuctionBrowseRecord> wrapper3=Wrappers.lambdaQuery(); wrapper3.eq(AuctionBrowseRecord::getDelFlag,0); wrapper3.eq(AuctionBrowseRecord::getTargetId,memberAuctionSalesroomDTO.getAuctionSalesroomId()); wrapper3.eq(AuctionBrowseRecord::getBrowseType,AuctionOrderTypeEnum.AUCTION_ITEMS); wrapper3.eq(AuctionBrowseRecord::getMemberId,memberAuctionSalesroomDTO.getMemberId()); wrapper3.ge(AuctionBrowseRecord::getCreateTime, now) .le(AuctionBrowseRecord::getCreateTime, newTime7); ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionSalesroomMapper.xml
@@ -8,6 +8,7 @@ <if test="param.salesroomName!=null and param.salesroomName != ''"> AND salesroom_name LIKE CONCAT('%',#{param.salesroomName},'%') </if> AND type=1 ORDER BY CASE WHEN status = 0 THEN 2 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java
@@ -398,7 +398,7 @@ .collect(Collectors.toList()); Page<GoodsGroupPurchase> page = new Page<>(homeGoodsSkuDTO.getPageCurr(), homeGoodsSkuDTO.getPageSize()); LambdaQueryWrapper< GoodsGroupPurchase> wrapper= Wrappers.lambdaQuery(); if (homeGoodsSkuDTO.getSkuName()!=null){ if (goodsSkuIdList!=null){ wrapper.in(GoodsGroupPurchase::getId,goodsSkuIdList); } wrapper.eq(GoodsGroupPurchase::getListingStatus,0); ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.enums.AuctionOrderTypeEnum; import com.ruoyi.common.core.enums.ListingStatusEnum; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.StringUtils; @@ -19,11 +20,13 @@ import com.ruoyi.goods.controller.management.dto.GoodsSkuQuery; import com.ruoyi.goods.controller.management.vo.GoodsInfoTitleValueVO; import com.ruoyi.goods.controller.management.vo.GoodsSkuVO; import com.ruoyi.goods.domain.GoodsBrowseRecord; import com.ruoyi.goods.domain.GoodsInfoTitleValue; import com.ruoyi.goods.domain.MemberGoodsCollection; import com.ruoyi.goods.mapper.GoodsGroupPurchaseMapper; import com.ruoyi.goods.mapper.GoodsSeckillMapper; import com.ruoyi.goods.mapper.GoodsSkuMapper; import com.ruoyi.goods.service.IGoodsBrowseRecordService; import com.ruoyi.goods.service.IGoodsInfoTitleValueService; import com.ruoyi.goods.service.IGoodsSkuService; import com.ruoyi.goods.service.IMemberGoodsCollectionService; @@ -80,6 +83,10 @@ private final GoodsSeckillMapper goodsSeckillMapper; private final GoodsGroupPurchaseMapper goodsGroupPurchaseMapper; private final RedissonClient redissonClient; @Resource private IGoodsBrowseRecordService iGoodsBrowseRecordService; @Resource private OrderClient orderClient; @@ -466,16 +473,34 @@ }else{ homeGoodsSkuInfoVO.setIsCollection(1); } LambdaQueryWrapper<GoodsGroupPurchase> queryWrapper2 =new LambdaQueryWrapper<>(); queryWrapper2.eq(GoodsGroupPurchase::getListingStatus, ListingStatusEnum.ON_SHELVES) .eq(GoodsGroupPurchase::getGoodsSkuId, byId.getId()); GoodsGroupPurchase goodsGroupPurchase2 = goodsGroupPurchaseMapper.selectOne(queryWrapper2); if (goodsGroupPurchase2!=null){ HomeGoodsSkuDTO homeGoodsSkuDTO1 =new HomeGoodsSkuDTO(); homeGoodsSkuDTO1.setGoodsSkuId(goodsGroupPurchase.getId()); homeGoodsSkuDTO1.setMemberId(homeGoodsSkuDTO.getMemberId()); List<OrderVO> data4 = orderClient.getOrderByGroupPurchaseMemberList(homeGoodsSkuDTO1, SecurityConstants.INNER).getData(); if (data4!=null){ homeGoodsSkuInfoVO.setGroupPurchaseGoods(2); }else{ homeGoodsSkuInfoVO.setGroupPurchaseGoods(1); } LocalDateTime now = LocalDateTime.now(); LocalDateTime newTime7 = now.minusDays(7); LambdaQueryWrapper<GoodsBrowseRecord> wrapper4=Wrappers.lambdaQuery(); 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); List<GoodsBrowseRecord> list1 = iGoodsBrowseRecordService.list(wrapper4); if (list1.size()==0){ GoodsBrowseRecord auctionBrowseRecord=new GoodsBrowseRecord(); auctionBrowseRecord.setMemberId(homeGoodsSkuDTO.getMemberId()); auctionBrowseRecord.setGoodsSkuId(homeGoodsSkuDTO.getGoodsSkuId()); iGoodsBrowseRecordService.save(auctionBrowseRecord); } return homeGoodsSkuInfoVO; }
@@ -179,7 +179,11 @@ appMiniLoginVo.setZfbuserid(response.getOpenId()); appMiniLoginVo.setSysUser(sysUser); appMiniLoginVo.setMemberid(member.getId()); redisService.setCacheObject(SecurityConstant.SESSION_KEY + response.getUserId(), null, 1L, TimeUnit.DAYS); Member byId = this.getById(member.getId()); if (appMiniLoginDto.getPhone()!=null){ byId.setPhone(appMiniLoginDto.getPhone()); this.updateById(byId); } }else{ //创建新用户 String memberId = IdUtils.simpleUUID(); @@ -272,11 +276,13 @@ appMiniLoginVo.setWxUnionid(member.getWxUnionid()); appMiniLoginVo.setSysUser(sysUser); appMiniLoginVo.setMemberid(member.getId()); Member byId = this.getById(member.getId()); if (appMiniLoginDto.getPhone()!=null){ byId.setPhone(appMiniLoginDto.getPhone()); this.updateById(byId); } redisService.setCacheObject(SecurityConstant.SESSION_KEY + openid, sessionKey, 1L, TimeUnit.DAYS); } } }
@@ -158,7 +158,7 @@ order.setTotalAmount(OrderDTO.getTotalAmount()); order.setOrderStatus(OrderStatusEnum.TO_PLAY); order.setPoints(OrderDTO.getPoints()); order.setGoodsQuantity(OrderDTO.getGoodsQuantity()); order.setGoodsQuantity(1); order.setReceiverName(OrderDTO.getReceiverName()); order.setReceiverPhone(OrderDTO.getReceiverphone()); order.setReceiverCity(OrderDTO.getReceiverCity());
