From e895d0b3f09cd855cfcd733643965822bfbd49df Mon Sep 17 00:00:00 2001 From: rentaiming <806181062@qq.com> Date: 星期一, 03 六月 2024 09:58:55 +0800 Subject: [PATCH] 修改循环注入 --- ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java | 128 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 121 insertions(+), 7 deletions(-) diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java index ba23349..13afb40 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java @@ -1,10 +1,14 @@ package com.ruoyi.goods.service.impl; +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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.collect.Lists; import com.ruoyi.common.core.constant.SecurityConstants; +import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.enums.GroupStatusEnum; import com.ruoyi.common.core.enums.ListingStatusEnum; import com.ruoyi.common.core.enums.OrderStatusEnum; @@ -14,6 +18,9 @@ import com.ruoyi.common.core.utils.page.BeanUtils; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.common.redis.service.RedisService; +import com.ruoyi.system.api.domain.Member; +import com.ruoyi.system.api.domain.dto.*; +import com.ruoyi.system.api.domain.vo.GoodsGroupPurchaseInfoVO; import com.ruoyi.goods.controller.management.dto.GoodsGroupPurchaseDTO; import com.ruoyi.goods.controller.management.dto.GoodsGroupPurchaseQuery; import com.ruoyi.goods.controller.management.vo.GoodsGroupPurchaseVO; @@ -26,10 +33,10 @@ import com.ruoyi.system.api.constants.NotificationTypeConstant; import com.ruoyi.system.api.domain.GoodsSku; import com.ruoyi.system.api.domain.Order; -import com.ruoyi.system.api.domain.dto.ListStatusDTO; -import com.ruoyi.system.api.domain.dto.OrderUpdDTO; -import com.ruoyi.system.api.domain.dto.RefundDTO; +import com.ruoyi.system.api.domain.vo.OrderVO; +import com.ruoyi.system.api.domain.vo.WdGoodsGroupPurchaseVO; import com.ruoyi.system.api.feignClient.OrderClient; +import com.ruoyi.system.api.util.WebSocketUsers; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -39,7 +46,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import util.WebSocketUsers; /** * <p> @@ -119,7 +125,7 @@ .ge(GoodsSku::getStock, latestStock) .eq(GoodsSku::getId, goodsSku.getId()); this.updateById(goodsGroupPurchase); - asyncMethodService.groupPurchaseScheduleTask(goodsGroupPurchase); + asyncMethodService.groupPurchaseScheduleTask(Lists.newArrayList(goodsGroupPurchase)); } } @@ -180,12 +186,15 @@ public void startGroupPurchase(Long groupPurchaseId) throws JsonProcessingException { log.info(">>>>>>>>>>>>>>>>>>>>{}团购商品开始团购<<<<<<<<<<<<<<<<<<<<", groupPurchaseId); GoodsGroupPurchase groupPurchase = this.getById(groupPurchaseId); - if (StringUtils.isNotNull(groupPurchase)) { + if (StringUtils.isNotNull(groupPurchase) && groupPurchase.getStartStatus() + .equals(StartStatusEnum.NOT_STARTED) && groupPurchase.getListingStatus() + .equals(ListingStatusEnum.ON_SHELVES)) { this.lambdaUpdate().set(GoodsGroupPurchase::getStartStatus, StartStatusEnum.STARTED) .eq(GoodsGroupPurchase::getId, groupPurchaseId).update(); Map<String, Object> map = new ConcurrentHashMap<>(); map.put("notification_type", NotificationTypeConstant.GROUP_PURCHASE); map.put("notification_time", LocalDateTime.now()); + map.put("target_id", groupPurchaseId); map.put("message_type", "start"); String msg = objectMapper.writeValueAsString(map); WebSocketUsers.sendMessageToUsersByText(msg); @@ -202,12 +211,14 @@ public void endGroupPurchase(Long groupPurchaseId) throws JsonProcessingException { log.info(">>>>>>>>>>>>>>>>>>>>{}团购商品结束团购<<<<<<<<<<<<<<<<<<<<", groupPurchaseId); GoodsGroupPurchase groupPurchase = this.getById(groupPurchaseId); - if (StringUtils.isNotNull(groupPurchase)) { + if (StringUtils.isNotNull(groupPurchase) && groupPurchase.getStartStatus() + .equals(StartStatusEnum.STARTED)) { this.lambdaUpdate().set(GoodsGroupPurchase::getStartStatus, StartStatusEnum.ENDED) .eq(GoodsGroupPurchase::getId, groupPurchaseId).update(); Map<String, Object> map = new ConcurrentHashMap<>(); map.put("notification_type", NotificationTypeConstant.GROUP_PURCHASE); map.put("notification_time", LocalDateTime.now()); + map.put("target_id", groupPurchaseId); map.put("message_type", "end"); String msg = objectMapper.writeValueAsString(map); WebSocketUsers.sendMessageToUsersByText(msg); @@ -268,4 +279,107 @@ .eq(GoodsGroupPurchase::getId, id).update(); } } + + @Override + public GoodsGroupPurchaseInfoVO getGoodsGroupPurchaseInfo(HomeGoodsSkuDTO homeGoodsSkuDTO) { + GoodsSku byId = goodsSkuService.getById(homeGoodsSkuDTO.getGoodsSkuId()); + LambdaQueryWrapper<GoodsGroupPurchase> wrapper3= Wrappers.lambdaQuery(); + wrapper3.eq(GoodsGroupPurchase::getDelFlag,0); + wrapper3.eq(GoodsGroupPurchase::getGoodsSkuId,homeGoodsSkuDTO.getGoodsSkuId()); + GoodsGroupPurchase one = this.getOne(wrapper3); + GoodsGroupPurchaseInfoVO goodsGroupPurchaseInfoVO=new GoodsGroupPurchaseInfoVO(); + goodsGroupPurchaseInfoVO.setGoodsSkuId(one.getId()); + goodsGroupPurchaseInfoVO.setGoodsSkuName(byId.getSkuName()); + goodsGroupPurchaseInfoVO.setYears(String.valueOf(byId.getYears().getYear())); + goodsGroupPurchaseInfoVO.setCoverPic(byId.getCoverPic()); + goodsGroupPurchaseInfoVO.setPrice(byId.getPrice()); + goodsGroupPurchaseInfoVO.setShareTitle(byId.getShareTitle()); + goodsGroupPurchaseInfoVO.setSharePic(byId.getSharePic()); + goodsGroupPurchaseInfoVO.setGroupPurchasePrice(one.getGroupPurchasePrice()); + goodsGroupPurchaseInfoVO.setGroupSize(one.getGroupSize()); + goodsGroupPurchaseInfoVO.setLimitNumber(one.getLimitNumber()); + goodsGroupPurchaseInfoVO.setStartTime(one.getStartTime()); + goodsGroupPurchaseInfoVO.setEndTime(one.getEndTime()); + goodsGroupPurchaseInfoVO.setDescription(one.getDescription()); + goodsGroupPurchaseInfoVO.setStartStatus(one.getStartStatus()); + goodsGroupPurchaseInfoVO.setListingStatus(one.getListingStatus()); + goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus()); + + Order data = orderClient.getOrderByGroupPurchaseMemberId(homeGoodsSkuDTO, SecurityConstants.INNER).getData(); + if (data!=null){ + goodsGroupPurchaseInfoVO.setIsGoodsGroupPurchase(2); + }else{ + goodsGroupPurchaseInfoVO.setIsGoodsGroupPurchase(1); + } + + return goodsGroupPurchaseInfoVO; + } + + @Override + public void QxGoodsGroupPurchase(HomeGoodsSkuDTO homeGoodsSkuDTO) { + Order order1 = orderClient.getOrderByGroupPurchaseMemberId(homeGoodsSkuDTO, SecurityConstants.INNER).getData(); + RefundDTO refundDTO = new RefundDTO(); + refundDTO.setOrderNo(order1.getOrderNo()); + refundDTO.setAmount(order1.getTotalAmount()); + + List<RefundDTO>refundDTOList=new ArrayList<>(); + refundDTOList.add(refundDTO); + + List<Order> orderList=new ArrayList<>(); + orderList.add(order1); + + Map<String, Object> data = orderClient.refund(refundDTOList, + SecurityConstants.INNER).getData(); + if (StringUtils.isNotEmpty(data)) { + // 处理退款返回结果 + List<String> successfulOrders = new ArrayList<>(); + List<String> failedOrders = new ArrayList<>(); + + data.forEach((key, value) -> { + if ((boolean) value) { + successfulOrders.add(key); + } else { + failedOrders.add(key); + } + }); + // 处理退款结果 + List<Order> updateOrderList = orderList.stream() + .filter(order -> successfulOrders.contains(order.getOrderNo())) + .peek(order -> { + order.setOrderStatus(OrderStatusEnum.CANCELED); + }).collect(Collectors.toList()); + List<OrderUpdDTO> orderUpdDTOS = BeanUtils.copyList(updateOrderList, + OrderUpdDTO.class); + orderClient.updateOrderList(orderUpdDTOS, SecurityConstants.INNER); + } + + } + + @Override + public PageDTO<WdGoodsGroupPurchaseVO> CtjlGoodsGroupPurchase(HomeGoodsSkuDTO homeGoodsSkuDTO) { + List<OrderVO> data = orderClient.getOrderByGroupPurchaseMemberList(homeGoodsSkuDTO, SecurityConstants.INNER).getData(); + List<Long> goodsSkuIdList = data.stream() + .map(OrderVO::getGoodsSkuId) + .collect(Collectors.toList()); + Page<GoodsGroupPurchase> page = new Page<>(homeGoodsSkuDTO.getPageCurr(), homeGoodsSkuDTO.getPageSize()); + LambdaQueryWrapper< GoodsGroupPurchase> wrapper= Wrappers.lambdaQuery(); + wrapper.in(GoodsGroupPurchase::getGoodsSkuId,goodsSkuIdList); + wrapper.eq(GoodsGroupPurchase::getListingStatus,0); + wrapper.eq( GoodsGroupPurchase::getDelFlag,0); + Page< GoodsGroupPurchase> page1 = this.page(page, wrapper); + + PageDTO<WdGoodsGroupPurchaseVO> GoodsGroupPurchaseVOPageDTO = PageDTO.of(page1, WdGoodsGroupPurchaseVO.class); + List<WdGoodsGroupPurchaseVO> list2 = GoodsGroupPurchaseVOPageDTO.getList(); + for (WdGoodsGroupPurchaseVO goodsGroupPurchaseeVO:list2) { + GoodsSku byId = goodsSkuService.getById(goodsGroupPurchaseeVO.getGoodsSkuId()); + goodsGroupPurchaseeVO.setGoodsSkuName(byId.getSkuName()); + goodsGroupPurchaseeVO.setCoverPic(byId.getCoverPic()); + goodsGroupPurchaseeVO.setPrice(byId.getPrice()); + goodsGroupPurchaseeVO.setYears(String.valueOf(byId.getYears().getYear())); + goodsGroupPurchaseeVO.setIsGoodsGroupPurchase(2); + } + + + return GoodsGroupPurchaseVOPageDTO; + } } -- Gitblit v1.7.1