ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/async/AsyncMethodService.java
@@ -3,9 +3,9 @@ import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.goods.domain.GoodsGroupPurchase; import com.ruoyi.goods.domain.GoodsSeckill; import com.ruoyi.system.api.constants.DelayTaskEnum; import com.ruoyi.system.api.domain.DelayTask; import com.ruoyi.system.api.domain.GoodsSeckill; import com.ruoyi.system.api.feignClient.SysUserClient; import java.time.Duration; import java.time.LocalDateTime; ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java
@@ -14,11 +14,11 @@ 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.domain.GoodsSku; 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.domain.GoodsSku; import com.ruoyi.system.api.domain.Order; import com.ruoyi.system.api.domain.dto.ListStatusDTO; import com.ruoyi.system.api.feignClient.OrderClient; ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java
@@ -17,12 +17,11 @@ import com.ruoyi.goods.service.IGoodsSeckillService; 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.domain.DelayTask; import com.ruoyi.system.api.domain.GoodsSeckill; import com.ruoyi.system.api.domain.GoodsSku; import com.ruoyi.system.api.domain.dto.ListStatusDTO; import com.ruoyi.system.api.feignClient.OrderClient; import com.ruoyi.system.api.feignClient.SysUserClient; import java.util.List; import java.util.Optional; import lombok.RequiredArgsConstructor; @@ -47,7 +46,6 @@ private final OrderClient orderClient; private final RedisService redisService; private final SysUserClient sysUserClient; private final RedissonClient redissonClient; private final AsyncMethodService asyncMethodService; @Override @Transactional(rollbackFor = Exception.class) ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/task/GoodsScheduler.java
@@ -3,10 +3,10 @@ import com.ruoyi.common.core.enums.ListingStatusEnum; import com.ruoyi.common.core.enums.StartStatusEnum; import com.ruoyi.goods.domain.GoodsGroupPurchase; import com.ruoyi.goods.domain.GoodsSeckill; import com.ruoyi.goods.service.IGoodsGroupPurchaseService; import com.ruoyi.goods.service.IGoodsSeckillService; import com.ruoyi.goods.service.async.AsyncMethodService; import com.ruoyi.system.api.domain.GoodsSeckill; import java.time.LocalDateTime; import java.util.List; import lombok.RequiredArgsConstructor; ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java
@@ -3,21 +3,18 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.order.dto.MemberInvoiceRiseDTO; import com.ruoyi.order.domain.pojo.MemberInvoiceRise; import com.ruoyi.order.domain.pojo.Order; import com.ruoyi.order.dto.MemberInvoiceRiseDTO; import com.ruoyi.order.service.IMemberInvoiceRiseService; import com.ruoyi.order.service.IOrderService; import com.ruoyi.system.api.domain.Order; import io.swagger.annotations.ApiOperation; import javax.annotation.Resource; import org.apache.poi.ss.formula.functions.T; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; /** * <p> ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java
@@ -1,12 +1,10 @@ package com.ruoyi.order.service; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.order.dto.MemberInvoiceRiseDTO; import com.ruoyi.order.domain.pojo.MemberInvoiceRise; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.order.domain.pojo.Order; import java.util.List; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.order.domain.pojo.MemberInvoiceRise; import com.ruoyi.order.dto.MemberInvoiceRiseDTO; import com.ruoyi.system.api.domain.Order; /** * <p> ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java
@@ -3,20 +3,18 @@ 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.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.order.domain.pojo.MemberInvoiceOrder; import com.ruoyi.order.dto.MemberInvoiceRiseDTO; import com.ruoyi.order.domain.pojo.MemberInvoiceRise; import com.ruoyi.order.domain.pojo.Order; import com.ruoyi.order.dto.MemberInvoiceRiseDTO; import com.ruoyi.order.mapper.MemberInvoiceRiseMapper; import com.ruoyi.order.service.IMemberInvoiceRiseService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.order.service.IOrderService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.ruoyi.system.api.domain.Order; import java.util.ArrayList; import java.util.List; import javax.annotation.Resource; import org.springframework.stereotype.Service; /** * <p> ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
@@ -3,21 +3,28 @@ 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.ruoyi.common.core.utils.page.PageDTO; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.enums.OrderFromEnum; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.order.domain.pojo.MemberInvoice; import com.ruoyi.order.domain.pojo.MemberInvoiceOrder; import com.ruoyi.order.domain.pojo.OrderAuction; import com.ruoyi.order.domain.pojo.OrderMall; import com.ruoyi.order.dto.MemberInvoiceDTO; import com.ruoyi.order.domain.pojo.*; import com.ruoyi.order.mapper.MemberInvoiceMapper; import com.ruoyi.order.service.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.order.service.IMemberInvoiceOrderService; import com.ruoyi.order.service.IMemberInvoiceService; import com.ruoyi.order.service.IOrderAuctionService; import com.ruoyi.order.service.IOrderMallService; import com.ruoyi.order.service.IOrderService; import com.ruoyi.system.api.domain.GoodsSeckill; import com.ruoyi.system.api.domain.GoodsSku; import com.ruoyi.system.api.domain.Order; import com.ruoyi.system.api.feignClient.GoodsSkuClient; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; import javax.annotation.Resource; import org.springframework.stereotype.Service; /** * <p>
