From 3d1c46677a3fb95a4d776735925047c08dee17a3 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 07 六月 2024 18:17:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java | 190 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 175 insertions(+), 15 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 a51d3a5..b5c3e66 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,13 +1,16 @@
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.enums.GroupStatusEnum;
import com.ruoyi.common.core.enums.ListingStatusEnum;
-import com.ruoyi.common.core.enums.PaymentMethodEnum;
+import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.common.core.enums.StartStatusEnum;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
@@ -17,25 +20,34 @@
import com.ruoyi.goods.controller.management.dto.GoodsGroupPurchaseDTO;
import com.ruoyi.goods.controller.management.dto.GoodsGroupPurchaseQuery;
import com.ruoyi.goods.controller.management.vo.GoodsGroupPurchaseVO;
-import com.ruoyi.goods.domain.GoodsGroupPurchase;
import com.ruoyi.goods.mapper.GoodsGroupPurchaseMapper;
import com.ruoyi.goods.service.IGoodsGroupPurchaseService;
import com.ruoyi.goods.service.IGoodsSkuService;
import com.ruoyi.goods.service.async.AsyncMethodService;
import com.ruoyi.system.api.constants.DelayTaskEnum;
import com.ruoyi.system.api.constants.NotificationTypeConstant;
+import com.ruoyi.system.api.domain.GoodsGroupPurchase;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.Order;
+import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
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.GoodsGroupPurchaseInfoVO;
+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;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+import javax.annotation.Resource;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-import util.WebSocketUsers;
/**
* <p>
@@ -50,7 +62,8 @@
@RequiredArgsConstructor
public class GoodsGroupPurchaseServiceImpl extends ServiceImpl<GoodsGroupPurchaseMapper, GoodsGroupPurchase> implements IGoodsGroupPurchaseService {
- private final OrderClient orderClient;
+ @Resource
+ private OrderClient orderClient;
private final IGoodsSkuService goodsSkuService;
private final AsyncMethodService asyncMethodService;
private final RedisService redisService;
@@ -81,6 +94,16 @@
if (StringUtils.isNull(dto.getGoodsSkuId())) {
throw new ServiceException("商品id不能为空");
}
+ LambdaQueryWrapper<GoodsGroupPurchase> queryWrapper = Wrappers.lambdaQuery();
+ queryWrapper.eq(GoodsGroupPurchase::getGoodsSkuId, dto.getGoodsSkuId());
+ queryWrapper.eq(GoodsGroupPurchase::getListingStatus,
+ ListingStatusEnum.ON_SHELVES.getCode());
+ queryWrapper.between(GoodsGroupPurchase::getStartTime, dto.getStartTime(),
+ dto.getEndTime());
+ List<GoodsGroupPurchase> list = this.list(queryWrapper);
+ if (StringUtils.isNotEmpty(list)) {
+ throw new ServiceException("添加失败，当前商品在该时间段内有其他团购活动");
+ }
this.save(goodsGroupPurchase);
GoodsSku goodsSku = goodsSkuService.getById(dto.getGoodsSkuId());
if (StringUtils.isNull(goodsSku)) {
@@ -96,8 +119,14 @@
if (StringUtils.isNull(groupPurchase)) {
throw new ServiceException("团购商品不存在");
}
+ if (groupPurchase.getStartStatus().equals(StartStatusEnum.STARTED)) {
+ throw new ServiceException("已开始的团购商品不能编辑");
+ }
+ if (groupPurchase.getStartStatus().equals(StartStatusEnum.ENDED)) {
+ throw new ServiceException("已结束的团购商品不能编辑");
+ }
int originGroupStock = groupPurchase.getLimitNumber() * groupPurchase.getGroupSize();
- GoodsSku goodsSku = goodsSkuService.getById(dto.getGoodsSkuId());
+ GoodsSku goodsSku = goodsSkuService.getById(groupPurchase.getGoodsSkuId());
if (StringUtils.isNull(goodsSku)) {
throw new ServiceException("商品不存在");
}
@@ -109,7 +138,7 @@
.ge(GoodsSku::getStock, latestStock)
.eq(GoodsSku::getId, goodsSku.getId());
this.updateById(goodsGroupPurchase);
- asyncMethodService.groupPurchaseScheduleTask(goodsGroupPurchase);
+ asyncMethodService.groupPurchaseScheduleTask(Lists.newArrayList(goodsGroupPurchase));
}
}
@@ -170,12 +199,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);
@@ -192,12 +224,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);
@@ -221,13 +255,36 @@
//查询关联订单
List<Order> orderList = orderClient.getOrderByGroupPurchaseId(id,
SecurityConstants.INNER).getData();
- for (Order order : orderList) {
- if (PaymentMethodEnum.ALIPAY.equals(order.getPaymentMethod())) {
- //TODO 退款
- }
- if (PaymentMethodEnum.WECHAT.equals(order.getPaymentMethod())) {
- //TODO 退款
- }
+
+ List<RefundDTO> refundDTOList = orderList.stream().map(order -> {
+ RefundDTO refundDTO = new RefundDTO();
+ refundDTO.setOrderNo(order.getOrderNo());
+ refundDTO.setAmount(order.getTotalAmount());
+ return refundDTO;
+ }).collect(Collectors.toList());
+ 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);
}
} else {
this.lambdaUpdate()
@@ -235,4 +292,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