From 4de99ed19360471d9c9cc192d85f10185db4259f Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期六, 25 五月 2024 09:39:30 +0800 Subject: [PATCH] 解决冲突 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java | 12 ++--- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java | 9 +--- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java | 21 +++++++--- ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java | 2 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java | 10 ++--- ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/async/AsyncMethodService.java | 2 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java | 4 - ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/task/GoodsScheduler.java | 2 8 files changed, 30 insertions(+), 32 deletions(-) diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/async/AsyncMethodService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/async/AsyncMethodService.java index b07f229..a0a2954 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/async/AsyncMethodService.java +++ b/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; 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 fa87a08..4897393 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 @@ -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; diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java index 68bfb79..bf42aed 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java +++ b/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) diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/task/GoodsScheduler.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/task/GoodsScheduler.java index 942f3e8..85603d1 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/task/GoodsScheduler.java +++ b/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; diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java index 7f49d5d..bd15109 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java +++ b/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> diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java index 88d4097..3968773 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java +++ b/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> diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java index 7e330b0..735395d 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java +++ b/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> diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java index 83dec48..ac3f033 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java +++ b/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> -- Gitblit v1.7.1