ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
@@ -283,11 +283,10 @@ if (data2!=null){ articleCommentsVO1.setBmemberNickname(data2.getNickname()); articleCommentsVO1.setBmemberNickavatar(data2.getAvatar()); articleCommentsVO1.setBmemberId(data2.getId()); } articleCommentsVO1.setState(articleComments1.getState()); articleCommentsVO1.setBmemberId(data2.getId()); LambdaQueryWrapper<MemberLike> wrapper3= Wrappers.lambdaQuery(); wrapper3.eq(MemberLike::getMemberId,articleCommentsVO.getMemberId()); wrapper3.eq(MemberLike::getArticleId,articleComments1.getId()); ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java
@@ -120,11 +120,17 @@ memberArticleCollectionVO.setImages(byId.getImages()); memberArticleCollectionVO.setTitle(byId.getTitle()); memberArticleCollectionVO.setId(byId.getId()); R<Member> membeOne = memberClient.getMembeOne(memberArticleCollectionVO.getMemberId(), R<Member> membeOne = memberClient.getMembeOne(byId.getMemberId(), SecurityConstants.INNER); Member data = membeOne.getData(); memberArticleCollectionVO.setMemberNickname(data.getNickname()); memberArticleCollectionVO.setMemberAvatar(data.getAvatar()); if (data!=null){ memberArticleCollectionVO.setMemberNickname(data.getNickname()); memberArticleCollectionVO.setMemberAvatar(data.getAvatar()); }else{ memberArticleCollectionVO.setMemberNickname("平台发布"); memberArticleCollectionVO.setMemberAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png"); } memberArticleCollectionVO.setIsCollect(2); } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
@@ -116,9 +116,6 @@ public R<PayInfoVO> SaveSignUpNow(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) { if (memberAuctionSalesroomBondDTO.getBondType()==1){ AuctionGoods auctionGoods = AuctionGoodsMapper.selectById(memberAuctionSalesroomBondDTO.getAuctionGoodsId()); if (auctionGoods.getEndTime().isAfter(LocalDateTime.now())){ throw new ServiceException("商品拍卖已结束"); } if (auctionGoods.getListingStatus().getCode()==1){ throw new ServiceException("商品拍卖下线"); } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
@@ -422,14 +422,6 @@ .collect(Collectors.toSet()); } if (StringUtils.isNotEmpty(auctionGoodsListDTO.getSalesroomName())) { List<GoodsSku> goodsSku = goodsSkuClient.getGoodsByName(auctionGoodsListDTO.getSalesroomName(), SecurityConstants.INNER) .getData(); goodsSkuIdList = goodsSku.stream().map(GoodsSku::getId) .collect(Collectors.toSet()); } AuctionGoodsListPageDTO auctionGoodsListPageDTO=new AuctionGoodsListPageDTO(); auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList);
@@ -377,7 +377,7 @@ LambdaQueryWrapper<AuctionBidRecord> wrapper = Wrappers.lambdaQuery(); wrapper.eq(AuctionBidRecord::getAuctionSalesroomId, ationSalesroomGoodsDTO.getAuctionSalesroomId()); wrapper.eq(AuctionBidRecord::getDelFlag, 0); wrapper.eq(AuctionBidRecord::getStatus,0); wrapper.eq(AuctionBidRecord::getStatus,2); List<AuctionBidRecord> auctionBidRecordList = auctionBidRecordMapper.selectList(wrapper); for (AuctionBidRecord auctionBidRecord:auctionBidRecordList){ list.add(auctionBidRecord.getMemberId()); @@ -388,6 +388,12 @@ orderAuctionBondDTO.setUserList(list); orderClient.getOrderAuctionBond(orderAuctionBondDTO, SecurityConstants.INNER); }else{ OrderAuctionBondDTO orderAuctionBondDTO=new OrderAuctionBondDTO(); orderAuctionBondDTO.setAuctionSalesroomId(auctionSalesroom.getId()); orderAuctionBondDTO.setUserList(list); orderClient.getOrderAuctionBond(orderAuctionBondDTO, SecurityConstants.INNER); } Map<String, Object> map = new ConcurrentHashMap<>(); ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -422,6 +422,10 @@ wrapper.eq(AuctionSalesroom::getDelFlag,0); byId =this.getOne(wrapper); } if (byId.getType().getCode()==0){ throw new ServiceException("该拍卖会是线下拍卖会"); } MemberAuctionSalesroomInfoVO memberAuctionSalesroomInfoVO=new MemberAuctionSalesroomInfoVO(); memberAuctionSalesroomInfoVO.setId(byId.getId()); memberAuctionSalesroomInfoVO.setBound(byId.getBond()); @@ -538,6 +542,9 @@ wrapper.eq(AuctionSalesroom::getAuctionSalesroomNo,MemberAuctionSalesroomDTO.getSalesroomNO()); wrapper.eq(AuctionSalesroom::getDelFlag,0); AuctionSalesroom auctionSalesroom = this.getOne(wrapper); if (auctionSalesroom.getType().getCode()==0){ throw new ServiceException("该拍卖会是线下拍卖会"); } MemberAuctionSalesroomVO memberAuctionSalesroomVO=new MemberAuctionSalesroomVO(); memberAuctionSalesroomVO.setSalesroomName(auctionSalesroom.getSalesroomName()); memberAuctionSalesroomVO.setStatus(auctionSalesroom.getStatus().getCode()); @@ -631,14 +638,16 @@ wrapper3.orderByDesc(AuctionBidRecord::getLastBidAmount); wrapper3.last("limit 1"); AuctionBidRecord one3 = auctionBidRecordService.getOne(wrapper3); if (one3!=null){ if (bidVO.getLastBidAmount().doubleValue()<one3.getLastBidAmount().doubleValue()){ throw new ServiceException("出价不能比当前最高价低"); if (byId.getSalesroomStock()==1){ if (one3!=null){ if (bidVO.getLastBidAmount().doubleValue()<one3.getLastBidAmount().doubleValue()){ throw new ServiceException("出价不能比当前最高价低"); } } } if (one3!=null){ if (bidVO.getLastBidAmount().doubleValue()<one3.getLastBidAmount().add(byId.getMinimumMarkupAmount()).doubleValue()){ throw new ServiceException("出价不能比当前最高价低加每次加价低"); if (one3!=null){ if (bidVO.getLastBidAmount().doubleValue()<one3.getLastBidAmount().add(byId.getMinimumMarkupAmount()).doubleValue()){ throw new ServiceException("出价不能比当前最高价低加每次加价低"); } } } @@ -646,10 +655,6 @@ if (bigDecimal.doubleValue()>bidVO.getLastBidAmount().doubleValue()){ throw new ServiceException("出价不能比每次最少加价低"); } LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery(); wrapper1.eq(AuctionBidRecord::getMemberId,bidVO.getMemberId()); @@ -659,10 +664,6 @@ AuctionBidRecord one = auctionBidRecordService.getOne(wrapper1); if (one!=null){ BigDecimal bigDecimal1=one.getLastBidAmount().add(byId.getMinimumMarkupAmount()); if (bigDecimal1.doubleValue()>bidVO.getLastBidAmount().doubleValue()){ throw new ServiceException("出价不能比上次出价加每次最少加价低"); } one.setLastBidAmount(bidVO.getLastBidAmount()); one.setLastBidTime(LocalDateTime.now()); one.setBidCount(one.getBidCount()+1); @@ -729,6 +730,7 @@ wrapper1.orderByDesc(AuctionBidRecord::getLastBidAmount); wrapper1.last("limit 1"); AuctionBidRecord one = auctionBidRecordService.getOne(wrapper1); if (byId.getAuctionStock()==1){ if (one != null) { BigDecimal bigDecimal1 = one.getLastBidAmount().add(byId.getMinimumMarkupAmount()); if (bigDecimal1.doubleValue() > bidVO.getLastBidAmount().doubleValue()) { @@ -736,6 +738,7 @@ } } } LambdaQueryWrapper<AuctionBidRecord> wrapper3=Wrappers.lambdaQuery(); wrapper3.eq(AuctionBidRecord::getTargetId,bidVO.getTargetId()); wrapper3.eq(AuctionBidRecord::getDelFlag,0); ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsInfoTitleValueMapper.xml
@@ -19,4 +19,25 @@ </if> </where> </select> <select id="listByGoodsId" resultType="com.ruoyi.system.api.domain.vo.GoodsInfoTitleValueVO" parameterType="java.lang.Long"> SELECT titv.goods_info_title_id, titv.content, titv.sort_num, tit.title_name FROM t_goods_info_title_value titv LEFT JOIN t_goods_info_title tit ON titv.goods_info_title_id = tit.id <where> titv.del_flag = 0 AND tit.del_flag = 0 <if test="id != null"> AND titv.goods_sku_id = #{id} </if> ORDER BY titv.sort_num DESC </where> </select> </mapper> ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java
@@ -68,10 +68,13 @@ public R<T> getOrderAuctionBond(OrderAuctionBondDTO orderAuctionBondDTO) { LambdaQueryWrapper<OrderAuctionBond> wrapper = Wrappers.lambdaQuery(); wrapper.in(OrderAuctionBond::getMemberId, orderAuctionBondDTO.getUserList()); if (orderAuctionBondDTO.getUserList().size()>0){ wrapper.notIn(OrderAuctionBond::getMemberId, orderAuctionBondDTO.getUserList()); } wrapper.eq(OrderAuctionBond::getDelFlag, 0); wrapper.eq(OrderAuctionBond::getAuctionSalesroomId, orderAuctionBondDTO.getAuctionSalesroomId()); List<OrderAuctionBond> orderAuctionBondList = this.list(wrapper); for (OrderAuctionBond orderAuctionBond : orderAuctionBondList) { LambdaQueryWrapper<Paylog> wrapper1 = Wrappers.lambdaQuery(); wrapper1.eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo()); @@ -142,9 +145,6 @@ if (memberAuctionSalesroomBondDTO.getBondType() == 1) { AuctionGoods data = auctionClient.getauctionGoodsOne(memberAuctionSalesroomBondDTO, SecurityConstants.INNER).getData(); if (data.getEndTime().isAfter(LocalDateTime.now())){ throw new ServiceException("商品拍卖已结束"); } if (data.getListingStatus().getCode()==1){ throw new ServiceException("商品拍卖下线"); } ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -751,6 +751,17 @@ MemberOrderList.setOrderStatus(OrderStatusEnum.CANCELED); Order order = this.getOrder(MemberOrderList.getId()); order.setOrderStatus(OrderStatusEnum.CANCELED); if (order.getCouponId()!=0){ CouponMemberDTO couponMemberDTO1=new CouponMemberDTO(); couponMemberDTO1.setId(order.getCouponId()); couponMemberDTO1.setCouponStatus(0); promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER); order.setCouponId(0L); } this.updateById(order); } @@ -827,11 +838,15 @@ } }else { orderVO.setIsAuctionBond(1); orderVO.setBound(new BigDecimal(0)); } } catch (Exception e) { throw new RuntimeException(e); } if (order.getTotalAmount()==null){ order.setTotalAmount(new BigDecimal(0)); } CustomConfig memberPointsPoints = sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData(); orderVO.setOrderShuoMin(memberPointsPoints.getConfigValue()); CustomConfig ReturnCycle = sysUserClient.getconfig("RETURN_CYCLE").getData();
