ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
@@ -119,7 +119,7 @@ public R<PayInfoVO> SaveSignUpNow(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) { if (memberAuctionSalesroomBondDTO.getBondType()==1){ AuctionGoods auctionGoods = AuctionGoodsMapper.selectById(memberAuctionSalesroomBondDTO.getAuctionGoodsId()); if (auctionGoods.getEndTime().isAfter(LocalDateTime.now())){ if (LocalDateTime.now().isAfter(auctionGoods.getEndTime())){ throw new ServiceException("商品拍卖已结束"); } if (auctionGoods.getListingStatus().getCode()==1){ ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
@@ -73,7 +73,6 @@ Set<Long> goodsSkuIdList = new HashSet<>(); List<AuctionBrowseRecord> list = this.list(wrapper3); for (AuctionBrowseRecord auctionBrowseRecord:list){ AuctionGoods auctionGoods = auctionGoodsMapper.selectById(auctionBrowseRecord.getTargetId()); goodsSkuIdList.add(auctionBrowseRecord.getTargetId()); } Set<Long> goodsSkuIdList1 = null; @@ -97,6 +96,7 @@ page.setSize(auctionGoodsListDTO.getPageSize()); page.setCurrent(auctionGoodsListDTO.getPageCurr()); AuctionGoodsListPageDTO auctionGoodsListPageDTO=new AuctionGoodsListPageDTO(); if (StringUtils.isNotEmpty(auctionGoodsListDTO.getGoodsSkuName())) { if (StringUtils.isNotEmpty(goodsSkuIdList2)){ auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList2); }else{ @@ -104,6 +104,7 @@ goodsSkuIdList2.add(0L); auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList2); } } List<AuctionGoods> auctionGoodsPgeList = auctionGoodsMapper.getAuctionGoodsPgeList(page, auctionGoodsListPageDTO); List<AuctionGoodsListVO> auctionGoodsVOS=new ArrayList<>(); for (AuctionGoods auctionGoods:auctionGoodsPgeList){ ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
@@ -36,6 +36,7 @@ import com.ruoyi.system.api.feignClient.OrderClient; import com.ruoyi.system.api.feignClient.SysUserClient; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDateTime; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -175,6 +176,7 @@ LambdaQueryWrapper<AuctionSalesroomGoods> wrapper=Wrappers.lambdaQuery(); wrapper.eq(AuctionSalesroomGoods::getStatus,0); wrapper.eq(AuctionSalesroomGoods::getDelFlag,0); wrapper.eq(AuctionSalesroomGoods::getBackupStatus,false); wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId()); wrapper.orderByAsc(AuctionSalesroomGoods::getSortNum); List<AuctionSalesroomGoods> auctionSalesroomGoods = this.list(wrapper); @@ -192,6 +194,7 @@ LambdaQueryWrapper<AuctionSalesroomGoods> wrapper=Wrappers.lambdaQuery(); wrapper.eq(AuctionSalesroomGoods::getStatus,1); wrapper.eq(AuctionSalesroomGoods::getDelFlag,0); wrapper.eq(AuctionSalesroomGoods::getBackupStatus,false); wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId()); wrapper.last("limit 1"); AuctionSalesroomGoods auctionSalesroomGoods = this.getOne(wrapper); @@ -212,6 +215,7 @@ LambdaQueryWrapper<AuctionSalesroomGoods> wrapper1=Wrappers.lambdaQuery(); wrapper1.eq(AuctionSalesroomGoods::getDelFlag,0); wrapper1.eq(AuctionSalesroomGoods::getStatus,0); wrapper1.eq(AuctionSalesroomGoods::getBackupStatus,false); wrapper1.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId()); if (auctionSalesroomGoods!=null) { wrapper1.eq(AuctionSalesroomGoods::getSortNum, auctionSalesroomGoods.getSortNum() + 1); @@ -220,6 +224,7 @@ LambdaQueryWrapper<AuctionSalesroomGoods> wrappers=Wrappers.lambdaQuery(); wrappers.eq(AuctionSalesroomGoods::getStatus,0); wrappers.eq(AuctionSalesroomGoods::getDelFlag,0); wrappers.eq(AuctionSalesroomGoods::getBackupStatus,false); wrappers.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId()); wrappers.orderByAsc(AuctionSalesroomGoods::getSortNum); wrappers.last("limit 1"); @@ -260,8 +265,9 @@ wrapper2.notIn(AuctionSalesroomGoods::getSortNum,list); } wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId()); wrapper2.orderByAsc(AuctionSalesroomGoods::getSortNum); wrapper2.orderByAsc(AuctionSalesroomGoods::getStatus); wrapper2.orderByAsc(AuctionSalesroomGoods::getSortNum); wrapper2.eq(AuctionSalesroomGoods::getBackupStatus,false); List<AuctionSalesroomGoods> auctionSalesroomGoods2 = this.list(wrapper2); for (AuctionSalesroomGoods salesroomGoods:auctionSalesroomGoods2){ ForepartAuctionSalesroomGoodsVO forepartAuctionSalesroomGoodsVO1=new ForepartAuctionSalesroomGoodsVO(); @@ -691,12 +697,19 @@ SecurityConstants.INNER); MemberAddress memberAddress=memberAddressR.getData(); CustomConfig memberPointsMoney = sysUserClient.getconfig("MEMBER_POINTS_MONEY").getData(); CustomConfig memberPointsPoints = sysUserClient.getconfig("MEMBER_POINTS_POINTS").getData(); Double aDouble= Double.valueOf(memberPointsMoney.getConfigValue()) * Double.valueOf(memberPointsPoints.getConfigValue()); BigDecimal pi=lastBidAmount.multiply(new BigDecimal(aDouble)); order.setPoints(pi.intValue()); if (lastBidAmount.intValue()>0){ BigDecimal divide = lastBidAmount.divide(new BigDecimal(memberPointsMoney.getConfigValue())); BigDecimal roundedDown = divide.setScale(0, RoundingMode.DOWN); BigDecimal aDouble= roundedDown.multiply(new BigDecimal(memberPointsPoints.getConfigValue())); order.setPoints(aDouble.intValue()); }else{ order.setPoints(0); } if (memberAddress!=null){ order.setReceiverCity(memberAddress.getCity()); order.setReceiverDetailAddress(memberAddress.getDetailedAddress()); ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrowseRecordServiceImpl.java
@@ -20,6 +20,7 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -56,8 +57,14 @@ page.setCurrent(auctionCollectionDTO.getPageCurr()); LambdaQueryWrapper<GoodsBrowseRecord> wrapper= Wrappers.lambdaQuery(); wrapper.eq(GoodsBrowseRecord::getMemberId,auctionCollectionDTO.getMemberId()); if (StringUtils.isNotEmpty(auctionCollectionDTO.getGoodsSkuName())) { if (StringUtils.isNotEmpty(goodsSkuIdList1)){ wrapper.in(GoodsBrowseRecord::getGoodsSkuId,goodsSkuIdList1); }else { goodsSkuIdList1=new HashSet<>(); goodsSkuIdList1.add(0L); wrapper.in(GoodsBrowseRecord::getGoodsSkuId,goodsSkuIdList1); } } List<GoodsBrowseRecord> list = this.list(wrapper);
@@ -134,7 +134,7 @@ if (memberAuctionSalesroomBondDTO.getBondType() == 1) { AuctionGoods data = auctionClient.getauctionGoodsOne(memberAuctionSalesroomBondDTO, SecurityConstants.INNER).getData(); if (data.getEndTime().isAfter(LocalDateTime.now())){ if (LocalDateTime.now().isAfter(data.getEndTime())){ throw new ServiceException("商品拍卖已结束"); } if (data.getListingStatus().getCode()==1){ ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java
@@ -85,6 +85,7 @@ orderReturnRequest.setStatus(ReturnRequestStatusEnum.TO_BE_REVIEWED); orderReturnRequest.setAuditStatus(AuditStatusEnum.TO_BE_REVIEWED); orderReturnRequest.setAlbum(OrderReturnDTO.getAlbum()); orderReturnRequest.setRemark(OrderReturnDTO.getRemark()); CustomConfig returnAddressUserName = sysUserClient.getconfig("RETURN_ADDRESS_USER_NAME").getData(); orderReturnRequest.setRecipientName(returnAddressUserName.getConfigValue()); CustomConfig returnAddressUserPhone = sysUserClient.getconfig("RETURN_ADDRESS_USER_PHONE").getData(); ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -1048,18 +1048,21 @@ LambdaQueryWrapper<Order> paylogEntityWrapper = Wrappers.lambdaQuery(); paylogEntityWrapper.eq(Order::getMemberId, memberOrderListDTO.getMemberId()); paylogEntityWrapper.eq(Order::getOrderStatus,1); paylogEntityWrapper.eq(Order::getDelFlag,0); List<Order> list = this.list(paylogEntityWrapper); vo.setDzforderNo(list.size()); LambdaQueryWrapper<Order> paylogEntityWrapper1 = Wrappers.lambdaQuery(); paylogEntityWrapper1.eq(Order::getMemberId, memberOrderListDTO.getMemberId()); paylogEntityWrapper1.eq(Order::getOrderStatus,2); paylogEntityWrapper1.eq(Order::getDelFlag,0); List<Order> list1 = this.list(paylogEntityWrapper1); vo.setDfhorderNo(list1.size()); LambdaQueryWrapper<Order> paylogEntityWrapper2 = Wrappers.lambdaQuery(); paylogEntityWrapper2.eq(Order::getMemberId, memberOrderListDTO.getMemberId()); paylogEntityWrapper2.eq(Order::getOrderStatus,3); paylogEntityWrapper2.eq(Order::getDelFlag,0); List<Order> list2 = this.list(paylogEntityWrapper2); vo.setDshorderNo(list2.size()); @@ -1068,6 +1071,7 @@ LambdaQueryWrapper<Order> paylogEntityWrapper3 = Wrappers.lambdaQuery(); paylogEntityWrapper3.eq(Order::getMemberId, memberOrderListDTO.getMemberId()); paylogEntityWrapper3.eq(Order::getIsRequest,2); paylogEntityWrapper3.eq(Order::getDelFlag,0); List<Order> list3 = this.list(paylogEntityWrapper3); vo.setShorderNo(list3.size()); return vo;
