ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java
@@ -101,7 +101,7 @@ Page<MemberArticleCollection> page = new Page<>(articleDTO.getPageCurr(), articleDTO.getPageSize()); LambdaQueryWrapper<MemberArticleCollection> wrapper= Wrappers.lambdaQuery(); wrapper.eq(MemberArticleCollection::getMemberId,articleDTO.getMemberId()); if (StringUtils.isNotEmpty(articleDTO.getTitle())){ if (StringUtils.isNotEmpty(articleDTO.getGoodsSkuName())){ if (goodsSkuIdList.size()>0){ wrapper.in(MemberArticleCollection::getTargetId,goodsSkuIdList); }else{ @@ -111,6 +111,7 @@ } } wrapper.eq(MemberArticleCollection::getDelFlag,0); wrapper.orderByDesc(MemberArticleCollection::getCreateTime); Page<MemberArticleCollection> page1 = this.page(page, wrapper); PageDTO<MemberArticleCollectionVO> articleCommentsVOPageDTO = PageDTO.of(page1, MemberArticleCollectionVO.class); List<MemberArticleCollectionVO> list2 = articleCommentsVOPageDTO.getList(); ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrowseRecordServiceImpl.java
@@ -66,6 +66,7 @@ wrapper.in(GoodsBrowseRecord::getGoodsSkuId,goodsSkuIdList1); } } wrapper.orderByDesc(GoodsBrowseRecord::getCreateTime); List<GoodsBrowseRecord> list = this.list(wrapper); List<HomeGoodsSkuListVO> auctionGoodsVOS=new ArrayList<>(); ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java
@@ -382,6 +382,8 @@ goodsGroupPurchaseInfoVO.setShareTitle(one.getShareTitle()); goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus()); goodsGroupPurchaseInfoVO.setStartStatus(one.getStartStatus()); goodsGroupPurchaseInfoVO.setStartTime(one.getStartTime()); goodsGroupPurchaseInfoVO.setEndTime(one.getEndTime()); goodsGroupPurchaseInfoVO.setSharePic(one.getSharePic()); goodsGroupPurchaseInfoVO.setGroupPurchasePrice(one.getGroupPurchasePrice()); goodsGroupPurchaseInfoVO.setGroupSize(one.getGroupSize()); @@ -408,7 +410,7 @@ goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus()); } }else{ goodsGroupPurchaseInfoVO.setCurrentNumber(one.getGroupSize()); goodsGroupPurchaseInfoVO.setCurrentNumber(one.getCurrentNumber()); goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus()); } @@ -459,11 +461,16 @@ } }else{ if (one.getGroupStatus().getCode()==0){ if (one.getGroupSize()-one.getCurrentNumber()<5){ goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.MS_FAILURE); if (one.getGroupSize()>5){ if (one.getGroupSize()-one.getCurrentNumber()<5){ goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.MS_FAILURE); }else{ goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus()); } }else{ goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus()); } }else { goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus()); } @@ -560,29 +567,32 @@ orderDTO.setMemberId(homeGoodsSkuDTO.getMemberId()); Order orderOne = orderClient.getOrderOne(orderDTO, SecurityConstants.INNER).getData(); LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper6= Wrappers.lambdaQuery(); wrapper6.eq(GoodsGroupPurchaseInfo::getDelFlag,0); wrapper6.eq(GoodsGroupPurchaseInfo::getGroupStatus,0); wrapper6.eq(GoodsGroupPurchaseInfo::getGroupPurchaseId,goodsGroupPurchaseeVO.getId()); wrapper6.eq(GoodsGroupPurchaseInfo::getMubre,orderOne.getGroupNo()); GoodsGroupPurchaseInfo one1 = goodsGroupPurchaseInfoService.getOne(wrapper6); if (one1!=null){ goodsGroupPurchaseeVO.setCurrentNumber(one1.getCurrentNumber()); if (one1.getGroupStatus()==0){ if (one1.getGroupSize()-one1.getCurrentNumber()<5){ goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.MS_FAILURE); }else{ goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP); if (orderOne!=null){ LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper6= Wrappers.lambdaQuery(); wrapper6.eq(GoodsGroupPurchaseInfo::getDelFlag,0); wrapper6.eq(GoodsGroupPurchaseInfo::getGroupStatus,0); wrapper6.eq(GoodsGroupPurchaseInfo::getGroupPurchaseId,goodsGroupPurchaseeVO.getId()); wrapper6.eq(GoodsGroupPurchaseInfo::getMubre,orderOne.getGroupNo()); GoodsGroupPurchaseInfo one1 = goodsGroupPurchaseInfoService.getOne(wrapper6); if (one1!=null){ goodsGroupPurchaseeVO.setCurrentNumber(one1.getCurrentNumber()); if (one1.getGroupStatus()==0){ if (one1.getGroupSize()-one1.getCurrentNumber()<5){ goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.MS_FAILURE); }else{ goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP); } }if (one1.getGroupStatus()==1){ goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP); }if (one1.getGroupStatus()==2){ goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.GROUP_FAILURE); } }if (one1.getGroupStatus()==1){ goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP); }if (one1.getGroupStatus()==2){ goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.GROUP_FAILURE); } } } }
@@ -299,6 +299,11 @@ LambdaQueryWrapper<GoodsSku> wrapper3= Wrappers.lambdaQuery(); wrapper3.eq(GoodsSku::getDelFlag,0); wrapper3.eq(GoodsSku::getListingStatus,0); if(homeGoodsSkuDTO.getId()!=null){ List arr=new ArrayList<>(); arr.add(homeGoodsSkuDTO.getId()); wrapper3.notIn(GoodsSku::getId,arr); } if (homeGoodsSkuDTO.getSkuName()!=null&&homeGoodsSkuDTO.getSkuName()!=""){ wrapper3.like(GoodsSku::getSkuName,homeGoodsSkuDTO.getSkuName()); } @@ -458,12 +463,13 @@ }else{ homeGoodsSkuInfoVO.setIsCollection(1); } List list1=new ArrayList<>(); list1.add(0); list1.add(1); LambdaQueryWrapper<GoodsGroupPurchase> queryWrapper2 =new LambdaQueryWrapper<>(); queryWrapper2.eq(GoodsGroupPurchase::getListingStatus, ListingStatusEnum.ON_SHELVES) .eq(GoodsGroupPurchase::getGoodsSkuId, byId.getId()) .eq(GoodsGroupPurchase::getStartStatus, StartStatusEnum.STARTED); .eq(GoodsGroupPurchase::getGoodsSkuId, byId.getId()).in(GoodsGroupPurchase::getStartStatus, list1); GoodsGroupPurchase goodsGroupPurchase2 = goodsGroupPurchaseMapper.selectOne(queryWrapper2); if (goodsGroupPurchase2!=null){ homeGoodsSkuInfoVO.setGroupPurchaseGoods(2); @@ -479,8 +485,8 @@ wrapper4.eq(GoodsBrowseRecord::getMemberId,homeGoodsSkuDTO.getMemberId()); wrapper4.ge(GoodsBrowseRecord::getCreateTime, newTime7) .le(GoodsBrowseRecord::getCreateTime,now ); List<GoodsBrowseRecord> list1 = iGoodsBrowseRecordService.list(wrapper4); if (list1.size()==0){ List<GoodsBrowseRecord> list2 = iGoodsBrowseRecordService.list(wrapper4); if (list2.size()==0){ GoodsBrowseRecord auctionBrowseRecord=new GoodsBrowseRecord(); auctionBrowseRecord.setMemberId(homeGoodsSkuDTO.getMemberId()); auctionBrowseRecord.setGoodsSkuId(homeGoodsSkuDTO.getGoodsSkuId()); ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InnerOrderAuctionBondController.java
@@ -116,6 +116,7 @@ } wrapper.eq(OrderAuctionBond::getBoundStatus,2); wrapper.eq(OrderAuctionBond::getDelFlag,0); wrapper.orderByDesc(OrderAuctionBond::getCreateTime); List<OrderAuctionBond> list = iOrderAuctionBondService.list(wrapper); return R.ok(list);
@@ -154,7 +154,7 @@ orderAuctionBond.setMemberId(memberAuctionSalesroomBondDTO.getMemberId()); orderAuctionBond.setBond(data.getBond()); orderAuctionBond.setBoundStatus(BondStatusEnum.PAID); orderAuctionBond.setBoundStatus(BondStatusEnum.TO_PLAY); orderAuctionBond.setBondType(AuctionOrderTypeEnum.REGULAR_ITEMS); this.save(orderAuctionBond); payInfoVO.setOrderNO(orderAuctionBond.getOrderNo()); payInfoVO.setType(0); ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java
@@ -84,7 +84,12 @@ OrderReturnRequest orderReturnRequest = new OrderReturnRequest(); orderReturnRequest.setOrderId(OrderReturnDTO.getOrderId()); orderReturnRequest.setRequestTime(LocalDateTime.now()); orderReturnRequest.setRequestType(RequestTypeEnum.fromCode(OrderReturnDTO.getRequestType())); if (OrderReturnDTO.getRequestType().equals("REFUND")){ orderReturnRequest.setRequestType(RequestTypeEnum.REFUND); }else{ orderReturnRequest.setRequestType(RequestTypeEnum.REFUNDS_AND_RETURNS); } orderReturnRequest.setRequestReason(OrderReturnDTO.getRequestReason()); orderReturnRequest.setStatus(ReturnRequestStatusEnum.TO_BE_REVIEWED); orderReturnRequest.setAuditStatus(AuditStatusEnum.TO_BE_REVIEWED); ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -645,18 +645,26 @@ BigDecimal pice1=new BigDecimal(data.getDiscountRate()); BigDecimal pice2=new BigDecimal(0.1); BigDecimal pice3=pice.multiply(pice1.multiply(pice2)); if (pice3.compareTo(new BigDecimal(data.getMaxDiscount().doubleValue()))>0){ pice3=new BigDecimal(data.getMaxDiscount().doubleValue()); if (data.getMaxDiscount()!=null){ if (pice3.compareTo(new BigDecimal(data.getMaxDiscount().doubleValue()))>0){ pice3=new BigDecimal(data.getMaxDiscount().doubleValue()); } } if(pice.compareTo(pice3)<0){ if(pice.compareTo(pice3)>0){ BigDecimal pice4= pice.subtract(pice3); if (pice4.doubleValue()>data.getMaxDiscount().doubleValue()){ pice=pice.subtract(data.getMaxDiscount()); order.setDiscountMoney(data.getMaxDiscount()); if (data.getMaxDiscount()!=null){ if (pice4.doubleValue()>data.getMaxDiscount().doubleValue()){ pice=pice.subtract(data.getMaxDiscount()); order.setDiscountMoney(data.getMaxDiscount()); }else{ order.setDiscountMoney(pice4); pice=pice3; } }else{ order.setDiscountMoney(pice4); order.setDiscountMoney(pice.subtract(pice3)); pice=pice3; } }else{ order.setDiscountMoney(pice); pice=new BigDecimal(0); ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
@@ -50,7 +50,7 @@ LambdaQueryWrapper<CouponMember> wrapper1= Wrappers.lambdaQuery(); if(couponMemberDTO.getCouponStatus()!=null){ wrapper1.eq(CouponMember::getCouponStatus, CouponUseEnum.getEnumByCode(couponMemberDTO.getCouponStatus()+1)); CouponUseEnum.getEnumByCode(couponMemberDTO.getCouponStatus())); } if (CouponList.size()>0){ wrapper1.notIn(CouponMember::getCouponId,CouponList);
