ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
@@ -133,6 +133,11 @@ public R<?> returnBondByAuctionGoodsId(Long id, String source) { return R.fail("普通拍卖退保证金失败" + cause.getMessage()); } @Override public R<?> autoCancelOrder(Long id, String source) { return null; } }; } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java
@@ -171,4 +171,8 @@ @GetMapping("/order-auction-bond/refund-bond/{id}") R<?> returnBondByAuctionGoodsId(@PathVariable("id") Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); @PutMapping("/order/autoCancelOrder/{id}") R<?> autoCancelOrder(@PathVariable("id") Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/MemberArticleCollectionVO.java
@@ -11,7 +11,7 @@ @Data public class MemberArticleCollectionVO { private Integer id; private Long id; @ApiModelProperty(value = "收藏目标id") private Long targetId; ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
@@ -97,6 +97,9 @@ Member data = membeOne.getData(); articleVO.setMemberNickname(data.getNickname()); articleVO.setMemberAvatar(data.getAvatar()); }else{ articleVO.setMemberNickname("平台发布"); articleVO.setMemberAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png"); } LambdaQueryWrapper<MemberLike> wrapper1 = Wrappers.lambdaQuery(); wrapper1.eq(MemberLike::getMemberId, articleDTO.getMemberId()); @@ -161,17 +164,24 @@ @Override public ArticleVO getMemberArticleInfo(ArticleDTO articleDTO) { Article article=this.getById(articleDTO.getId()); if (StringUtils.isNull(article)) { throw new ServiceException("资讯不存在了"); } ArticleVO articleVO = BeanUtils.copyBean(article, ArticleVO.class); R<Member> membeOne = memberClient.getMembeOne(articleVO.getMemberId(), SecurityConstants.INNER); Member data = membeOne.getData(); if (data!=null){ articleVO.setMemberNickname(data.getNickname()); articleVO.setMemberAvatar(data.getAvatar()); if(articleVO!=null){ R<Member> membeOne = memberClient.getMembeOne(articleVO.getMemberId(), SecurityConstants.INNER); Member data = membeOne.getData(); if (data!=null){ articleVO.setMemberNickname(data.getNickname()); articleVO.setMemberAvatar(data.getAvatar()); } }else{ articleVO.setMemberNickname("平台发布"); articleVO.setMemberAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png"); } LambdaQueryWrapper<MemberLike> wrapper1= Wrappers.lambdaQuery(); wrapper1.eq(MemberLike::getMemberId,articleDTO.getMemberId()); wrapper1.eq(MemberLike::getArticleId,article.getId()); ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java
@@ -113,6 +113,7 @@ memberArticleCollectionVO.setContent(byId.getContent()); memberArticleCollectionVO.setImages(byId.getImages()); memberArticleCollectionVO.setTitle(byId.getTitle()); memberArticleCollectionVO.setId(byId.getId()); R<Member> membeOne = memberClient.getMembeOne(memberArticleCollectionVO.getMemberId(), SecurityConstants.INNER); ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -408,6 +408,12 @@ @Override public MemberAuctionSalesroomInfoVO getMemberAuctionSalesroomInfo(MemberAuctionSalesroomDTO memberAuctionSalesroomDTO) { AuctionSalesroom byId = this.getById(memberAuctionSalesroomDTO.getAuctionSalesroomId()); if(byId==null){ LambdaQueryWrapper<AuctionSalesroom> wrapper=Wrappers.lambdaQuery(); wrapper.eq(AuctionSalesroom::getAuctionSalesroomNo,memberAuctionSalesroomDTO.getAuctionSalesroomId()); wrapper.eq(AuctionSalesroom::getDelFlag,0); byId =this.getOne(wrapper); } MemberAuctionSalesroomInfoVO memberAuctionSalesroomInfoVO=new MemberAuctionSalesroomInfoVO(); memberAuctionSalesroomInfoVO.setId(byId.getId()); memberAuctionSalesroomInfoVO.setBound(byId.getBond()); @@ -428,7 +434,9 @@ memberAuctionSalesroomInfoVO.setIsApply(1); } List<ForepartAuctionSalesroomGoodsVO> forepartAuctionSalesroomGoodsVOS=new ArrayList<>(); List<AuctionSalesroomGoods> auctionSalesroomGoods = auctionSalesroomGoodsMapper.getAuctionSalesroomGoods(memberAuctionSalesroomDTO); MemberAuctionSalesroomDTO memberAuctionSalesroomDTO1 =new MemberAuctionSalesroomDTO(); memberAuctionSalesroomDTO1.setAuctionSalesroomId(byId.getId()); List<AuctionSalesroomGoods> auctionSalesroomGoods = auctionSalesroomGoodsMapper.getAuctionSalesroomGoods(memberAuctionSalesroomDTO1); for (AuctionSalesroomGoods salesroomGoods:auctionSalesroomGoods){ ForepartAuctionSalesroomGoodsVO forepartAuctionSalesroomGoodsVO=new ForepartAuctionSalesroomGoodsVO(); forepartAuctionSalesroomGoodsVO.setSalesroomId(byId.getId()); ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
@@ -350,13 +350,13 @@ response.close(); httpClient.close(); } catch (IOException e) { throw new RuntimeException(e); throw new RuntimeException("姓名或者身份证号有误"); } } JSONObject jsonObject= JSON.parseObject(result); String object1= jsonObject.get("reason").toString(); if(!object1.equals("成功")){ throw new ServiceException(object1); throw new ServiceException("实名认证失败,姓名或者身份证号有误"); }
@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fasterxml.jackson.core.JsonProcessingException; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.enums.OrderStatusEnum; import com.ruoyi.common.core.utils.page.BeanUtils; import com.ruoyi.common.security.annotation.InnerAuth; import com.ruoyi.order.service.IOrderService; @@ -163,4 +165,15 @@ R<List<Order>> getOrderByCouponIds(@RequestBody Collection<Long> couponIds) { return R.ok(orderService.getOrderByCouponIds(couponIds)); } @InnerAuth @GetMapping("/autoCancelOrder/{id}") R<?> autoCancelOrder(@PathVariable("id") Long oid) { Order byId = orderService.getById(oid); if (byId.getOrderStatus().getCode()==1){ byId.setOrderStatus(OrderStatusEnum.CANCELED); orderService.updateById(byId); } return R.ok(); } } ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/listener/RedisListener.java
@@ -9,7 +9,10 @@ import com.ruoyi.system.api.feignClient.GoodsSkuClient; import java.util.Date; import javax.annotation.Resource; import com.ruoyi.system.api.feignClient.OrderClient; import lombok.extern.slf4j.Slf4j; import org.springframework.core.annotation.Order; import org.springframework.data.redis.connection.Message; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ValueOperations; @@ -30,6 +33,9 @@ private RedisTemplate<String, Object> redisTemplate; @Resource private GoodsSkuClient goodsSkuClient; @Resource private OrderClient orderClient; @Resource private AuctionClient auctionClient; public RedisListener(RedisMessageListenerContainer listenerContainer, @@ -132,6 +138,12 @@ } @Async public void orderClient(Long oid) { log.info("autoEndGroupPurchase scheduler task is running :{}", oid); orderClient.autoCancelOrder(oid, SecurityConstants.INNER); } @Async public void autoCancelOrder(Long orderId) { log.info("autoCancelOrder scheduler task is running :{}", orderId); }
