From 15311a828eb106d29d0f9d384537bb4730ecf2f8 Mon Sep 17 00:00:00 2001 From: starrysky <838252223@qq.com> Date: Sat, 17 Aug 2019 14:33:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E8=AE=A2?= =?UTF-8?q?=E5=8D=95--=20=E4=BF=AE=E6=94=B9=E5=90=8E=E7=9A=84=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=9C=A8=E5=8E=9F=E6=9D=A5=E4=B8=AD=E4=B8=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/CustomerOrder.java | 2 +- .../domain/CustomerOrderProduct.java | 2 +- .../CustomerOrderProductRepository.java | 4 +-- .../repository/CustomerOrderRepository.java | 4 +-- .../request/CreateCustomerOrderRequest.java | 4 +-- .../request/CustomerOrderProductRequest.java | 2 +- .../request/UpdateCustomerOrderRequest.java | 4 +-- .../rest/CustomerOrderController.java | 12 ++++---- .../service/CustomerOrderProductService.java | 8 +++--- .../service/CustomerOrderService.java | 11 ++++---- .../service/dto/CustomerOrderDTO.java | 2 +- .../service/dto/CustomerOrderProductDTO.java | 2 +- .../CustomerOrderProductQueryCriteria.java | 2 +- .../dto/CustomerOrderQueryCriteria.java | 2 +- .../impl/CustomerOrderProductServiceImpl.java | 14 +++++----- .../impl/CustomerOrderServiceImpl.java | 28 +++++++++---------- .../service/mapper/CustomerOrderMapper.java | 6 ++-- .../mapper/CustomerOrderProductMapper.java | 6 ++-- .../request/CreateCustomerOrderRequest.java | 6 ++-- 19 files changed, 59 insertions(+), 62 deletions(-) rename eladmin-system/src/main/java/me/zhengjie/modules/wms/{order => customerOrder}/domain/CustomerOrder.java (97%) rename eladmin-system/src/main/java/me/zhengjie/modules/wms/{order => customerOrder}/domain/CustomerOrderProduct.java (96%) rename eladmin-system/src/main/java/me/zhengjie/modules/wms/{order => customerOrder}/repository/CustomerOrderProductRepository.java (85%) rename eladmin-system/src/main/java/me/zhengjie/modules/wms/{order => customerOrder}/repository/CustomerOrderRepository.java (88%) rename eladmin-system/src/main/java/me/zhengjie/modules/wms/{order => customerOrder}/request/CreateCustomerOrderRequest.java (92%) rename eladmin-system/src/main/java/me/zhengjie/modules/wms/{order => customerOrder}/request/CustomerOrderProductRequest.java (93%) rename eladmin-system/src/main/java/me/zhengjie/modules/wms/{order => customerOrder}/request/UpdateCustomerOrderRequest.java (92%) rename eladmin-system/src/main/java/me/zhengjie/modules/wms/{order => customerOrder}/rest/CustomerOrderController.java (85%) rename eladmin-system/src/main/java/me/zhengjie/modules/wms/{order => customerOrder}/service/CustomerOrderProductService.java (81%) rename eladmin-system/src/main/java/me/zhengjie/modules/wms/{order => customerOrder}/service/CustomerOrderService.java (77%) rename eladmin-system/src/main/java/me/zhengjie/modules/wms/{order => customerOrder}/service/dto/CustomerOrderDTO.java (96%) rename eladmin-system/src/main/java/me/zhengjie/modules/wms/{order => customerOrder}/service/dto/CustomerOrderProductDTO.java (92%) rename eladmin-system/src/main/java/me/zhengjie/modules/wms/{order => customerOrder}/service/dto/CustomerOrderProductQueryCriteria.java (75%) rename eladmin-system/src/main/java/me/zhengjie/modules/wms/{order => customerOrder}/service/dto/CustomerOrderQueryCriteria.java (74%) rename eladmin-system/src/main/java/me/zhengjie/modules/wms/{order => customerOrder}/service/impl/CustomerOrderProductServiceImpl.java (84%) rename eladmin-system/src/main/java/me/zhengjie/modules/wms/{order => customerOrder}/service/impl/CustomerOrderServiceImpl.java (87%) rename eladmin-system/src/main/java/me/zhengjie/modules/wms/{order => customerOrder}/service/mapper/CustomerOrderMapper.java (61%) rename eladmin-system/src/main/java/me/zhengjie/modules/wms/{order => customerOrder}/service/mapper/CustomerOrderProductMapper.java (61%) rename eladmin-system/src/main/java/me/zhengjie/modules/wms/{order => customerOrder}/service/request/CreateCustomerOrderRequest.java (55%) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/domain/CustomerOrder.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/domain/CustomerOrder.java similarity index 97% rename from eladmin-system/src/main/java/me/zhengjie/modules/wms/order/domain/CustomerOrder.java rename to eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/domain/CustomerOrder.java index a5b9cf98..7b4c9f5b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/domain/CustomerOrder.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/domain/CustomerOrder.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.wms.order.domain; +package me.zhengjie.modules.wms.customerOrder.domain; import lombok.Data; import cn.hutool.core.bean.BeanUtil; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/domain/CustomerOrderProduct.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/domain/CustomerOrderProduct.java similarity index 96% rename from eladmin-system/src/main/java/me/zhengjie/modules/wms/order/domain/CustomerOrderProduct.java rename to eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/domain/CustomerOrderProduct.java index 01458952..015014eb 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/domain/CustomerOrderProduct.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/domain/CustomerOrderProduct.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.wms.order.domain; +package me.zhengjie.modules.wms.customerOrder.domain; import lombok.Data; import cn.hutool.core.bean.BeanUtil; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/repository/CustomerOrderProductRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/repository/CustomerOrderProductRepository.java similarity index 85% rename from eladmin-system/src/main/java/me/zhengjie/modules/wms/order/repository/CustomerOrderProductRepository.java rename to eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/repository/CustomerOrderProductRepository.java index bb94929e..045f6dd7 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/repository/CustomerOrderProductRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/repository/CustomerOrderProductRepository.java @@ -1,6 +1,6 @@ -package me.zhengjie.modules.wms.order.repository; +package me.zhengjie.modules.wms.customerOrder.repository; -import me.zhengjie.modules.wms.order.domain.CustomerOrderProduct; +import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrderProduct; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/repository/CustomerOrderRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/repository/CustomerOrderRepository.java similarity index 88% rename from eladmin-system/src/main/java/me/zhengjie/modules/wms/order/repository/CustomerOrderRepository.java rename to eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/repository/CustomerOrderRepository.java index d8f499d4..212d767b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/repository/CustomerOrderRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/repository/CustomerOrderRepository.java @@ -1,6 +1,6 @@ -package me.zhengjie.modules.wms.order.repository; +package me.zhengjie.modules.wms.customerOrder.repository; -import me.zhengjie.modules.wms.order.domain.CustomerOrder; +import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrder; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/request/CreateCustomerOrderRequest.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/request/CreateCustomerOrderRequest.java similarity index 92% rename from eladmin-system/src/main/java/me/zhengjie/modules/wms/order/request/CreateCustomerOrderRequest.java rename to eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/request/CreateCustomerOrderRequest.java index c31cd6e3..2221d5d4 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/request/CreateCustomerOrderRequest.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/request/CreateCustomerOrderRequest.java @@ -1,9 +1,9 @@ -package me.zhengjie.modules.wms.order.request; +package me.zhengjie.modules.wms.customerOrder.request; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import lombok.Data; -import me.zhengjie.modules.wms.order.domain.CustomerOrder; +import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrder; import java.sql.Timestamp; import java.util.List; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/request/CustomerOrderProductRequest.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/request/CustomerOrderProductRequest.java similarity index 93% rename from eladmin-system/src/main/java/me/zhengjie/modules/wms/order/request/CustomerOrderProductRequest.java rename to eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/request/CustomerOrderProductRequest.java index e34abe9c..bf56905f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/request/CustomerOrderProductRequest.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/request/CustomerOrderProductRequest.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.wms.order.request; +package me.zhengjie.modules.wms.customerOrder.request; import lombok.Data; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/request/UpdateCustomerOrderRequest.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/request/UpdateCustomerOrderRequest.java similarity index 92% rename from eladmin-system/src/main/java/me/zhengjie/modules/wms/order/request/UpdateCustomerOrderRequest.java rename to eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/request/UpdateCustomerOrderRequest.java index cb1ef71b..1cd93c77 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/request/UpdateCustomerOrderRequest.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/request/UpdateCustomerOrderRequest.java @@ -1,9 +1,9 @@ -package me.zhengjie.modules.wms.order.request; +package me.zhengjie.modules.wms.customerOrder.request; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import lombok.Data; -import me.zhengjie.modules.wms.order.service.dto.CustomerOrderProductDTO; +import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderProductDTO; import java.io.Serializable; import java.sql.Timestamp; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/rest/CustomerOrderController.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/rest/CustomerOrderController.java similarity index 85% rename from eladmin-system/src/main/java/me/zhengjie/modules/wms/order/rest/CustomerOrderController.java rename to eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/rest/CustomerOrderController.java index eee5d5b0..ea50fb9f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/rest/CustomerOrderController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/rest/CustomerOrderController.java @@ -1,17 +1,15 @@ -package me.zhengjie.modules.wms.order.rest; +package me.zhengjie.modules.wms.customerOrder.rest; import me.zhengjie.aop.log.Log; -import me.zhengjie.modules.wms.order.domain.CustomerOrder; -import me.zhengjie.modules.wms.order.request.CreateCustomerOrderRequest; -import me.zhengjie.modules.wms.order.request.UpdateCustomerOrderRequest; -import me.zhengjie.modules.wms.order.service.CustomerOrderService; -import me.zhengjie.modules.wms.order.service.dto.CustomerOrderQueryCriteria; +import me.zhengjie.modules.wms.customerOrder.request.UpdateCustomerOrderRequest; +import me.zhengjie.modules.wms.customerOrder.service.CustomerOrderService; +import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderQueryCriteria; +import me.zhengjie.modules.wms.customerOrder.request.CreateCustomerOrderRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.*; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/CustomerOrderProductService.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/CustomerOrderProductService.java similarity index 81% rename from eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/CustomerOrderProductService.java rename to eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/CustomerOrderProductService.java index 23b6f805..0269c16c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/CustomerOrderProductService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/CustomerOrderProductService.java @@ -1,11 +1,11 @@ -package me.zhengjie.modules.wms.order.service; +package me.zhengjie.modules.wms.customerOrder.service; //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import me.zhengjie.modules.wms.order.domain.CustomerOrderProduct; -import me.zhengjie.modules.wms.order.service.dto.CustomerOrderProductDTO; -import me.zhengjie.modules.wms.order.service.dto.CustomerOrderProductQueryCriteria; +import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrderProduct; +import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderProductDTO; +import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderProductQueryCriteria; import org.springframework.data.domain.Pageable; /** diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/CustomerOrderService.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/CustomerOrderService.java similarity index 77% rename from eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/CustomerOrderService.java rename to eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/CustomerOrderService.java index 699e6203..778b1775 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/CustomerOrderService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/CustomerOrderService.java @@ -1,13 +1,12 @@ -package me.zhengjie.modules.wms.order.service; +package me.zhengjie.modules.wms.customerOrder.service; //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import me.zhengjie.modules.wms.order.domain.CustomerOrder; -import me.zhengjie.modules.wms.order.request.CreateCustomerOrderRequest; -import me.zhengjie.modules.wms.order.request.UpdateCustomerOrderRequest; -import me.zhengjie.modules.wms.order.service.dto.CustomerOrderDTO; -import me.zhengjie.modules.wms.order.service.dto.CustomerOrderQueryCriteria; +import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderQueryCriteria; +import me.zhengjie.modules.wms.customerOrder.request.CreateCustomerOrderRequest; +import me.zhengjie.modules.wms.customerOrder.request.UpdateCustomerOrderRequest; +import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderDTO; import org.springframework.data.domain.Pageable; /** diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/dto/CustomerOrderDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderDTO.java similarity index 96% rename from eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/dto/CustomerOrderDTO.java rename to eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderDTO.java index ad61cfd6..5acd36d8 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/dto/CustomerOrderDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderDTO.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.wms.order.service.dto; +package me.zhengjie.modules.wms.customerOrder.service.dto; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/dto/CustomerOrderProductDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderProductDTO.java similarity index 92% rename from eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/dto/CustomerOrderProductDTO.java rename to eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderProductDTO.java index 7f02658b..6b7cfbf5 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/dto/CustomerOrderProductDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderProductDTO.java @@ -1,5 +1,5 @@ -package me.zhengjie.modules.wms.order.service.dto; +package me.zhengjie.modules.wms.customerOrder.service.dto; import lombok.Data; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/dto/CustomerOrderProductQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderProductQueryCriteria.java similarity index 75% rename from eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/dto/CustomerOrderProductQueryCriteria.java rename to eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderProductQueryCriteria.java index c26b5e9c..bf9b3bfb 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/dto/CustomerOrderProductQueryCriteria.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderProductQueryCriteria.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.wms.order.service.dto; +package me.zhengjie.modules.wms.customerOrder.service.dto; import lombok.Data; import java.sql.Timestamp; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/dto/CustomerOrderQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderQueryCriteria.java similarity index 74% rename from eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/dto/CustomerOrderQueryCriteria.java rename to eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderQueryCriteria.java index b15a4c6c..f016adaa 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/dto/CustomerOrderQueryCriteria.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderQueryCriteria.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.wms.order.service.dto; +package me.zhengjie.modules.wms.customerOrder.service.dto; import lombok.Data; import java.sql.Timestamp; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/impl/CustomerOrderProductServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderProductServiceImpl.java similarity index 84% rename from eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/impl/CustomerOrderProductServiceImpl.java rename to eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderProductServiceImpl.java index d6a2ee33..f84ed87a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/impl/CustomerOrderProductServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderProductServiceImpl.java @@ -1,11 +1,11 @@ -package me.zhengjie.modules.wms.order.service.impl; +package me.zhengjie.modules.wms.customerOrder.service.impl; -import me.zhengjie.modules.wms.order.domain.CustomerOrderProduct; -import me.zhengjie.modules.wms.order.repository.CustomerOrderProductRepository; -import me.zhengjie.modules.wms.order.service.CustomerOrderProductService; -import me.zhengjie.modules.wms.order.service.dto.CustomerOrderProductDTO; -import me.zhengjie.modules.wms.order.service.dto.CustomerOrderProductQueryCriteria; -import me.zhengjie.modules.wms.order.service.mapper.CustomerOrderProductMapper; +import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrderProduct; +import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderProductQueryCriteria; +import me.zhengjie.modules.wms.customerOrder.service.mapper.CustomerOrderProductMapper; +import me.zhengjie.modules.wms.customerOrder.repository.CustomerOrderProductRepository; +import me.zhengjie.modules.wms.customerOrder.service.CustomerOrderProductService; +import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderProductDTO; import me.zhengjie.utils.ValidationUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/impl/CustomerOrderServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java similarity index 87% rename from eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/impl/CustomerOrderServiceImpl.java rename to eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java index b3e7bc4f..439da0d5 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/impl/CustomerOrderServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java @@ -1,19 +1,19 @@ -package me.zhengjie.modules.wms.order.service.impl; +package me.zhengjie.modules.wms.customerOrder.service.impl; import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.wms.order.domain.CustomerOrder; -import me.zhengjie.modules.wms.order.domain.CustomerOrderProduct; -import me.zhengjie.modules.wms.order.repository.CustomerOrderProductRepository; -import me.zhengjie.modules.wms.order.repository.CustomerOrderRepository; -import me.zhengjie.modules.wms.order.request.CreateCustomerOrderRequest; -import me.zhengjie.modules.wms.order.request.CustomerOrderProductRequest; -import me.zhengjie.modules.wms.order.request.UpdateCustomerOrderRequest; -import me.zhengjie.modules.wms.order.service.CustomerOrderService; -import me.zhengjie.modules.wms.order.service.dto.CustomerOrderDTO; -import me.zhengjie.modules.wms.order.service.dto.CustomerOrderProductDTO; -import me.zhengjie.modules.wms.order.service.dto.CustomerOrderQueryCriteria; -import me.zhengjie.modules.wms.order.service.mapper.CustomerOrderMapper; -import me.zhengjie.modules.wms.order.service.mapper.CustomerOrderProductMapper; +import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrderProduct; +import me.zhengjie.modules.wms.customerOrder.repository.CustomerOrderRepository; +import me.zhengjie.modules.wms.customerOrder.request.UpdateCustomerOrderRequest; +import me.zhengjie.modules.wms.customerOrder.service.CustomerOrderService; +import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderProductDTO; +import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderQueryCriteria; +import me.zhengjie.modules.wms.customerOrder.service.mapper.CustomerOrderProductMapper; +import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrder; +import me.zhengjie.modules.wms.customerOrder.repository.CustomerOrderProductRepository; +import me.zhengjie.modules.wms.customerOrder.request.CreateCustomerOrderRequest; +import me.zhengjie.modules.wms.customerOrder.request.CustomerOrderProductRequest; +import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderDTO; +import me.zhengjie.modules.wms.customerOrder.service.mapper.CustomerOrderMapper; import me.zhengjie.utils.ValidationUtil; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/mapper/CustomerOrderMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/mapper/CustomerOrderMapper.java similarity index 61% rename from eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/mapper/CustomerOrderMapper.java rename to eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/mapper/CustomerOrderMapper.java index 2b3a27eb..2fae11d0 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/mapper/CustomerOrderMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/mapper/CustomerOrderMapper.java @@ -1,8 +1,8 @@ -package me.zhengjie.modules.wms.order.service.mapper; +package me.zhengjie.modules.wms.customerOrder.service.mapper; import me.zhengjie.mapper.EntityMapper; -import me.zhengjie.modules.wms.order.domain.CustomerOrder; -import me.zhengjie.modules.wms.order.service.dto.CustomerOrderDTO; +import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderDTO; +import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrder; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/mapper/CustomerOrderProductMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/mapper/CustomerOrderProductMapper.java similarity index 61% rename from eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/mapper/CustomerOrderProductMapper.java rename to eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/mapper/CustomerOrderProductMapper.java index fbbf0ee2..376ede99 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/mapper/CustomerOrderProductMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/mapper/CustomerOrderProductMapper.java @@ -1,8 +1,8 @@ -package me.zhengjie.modules.wms.order.service.mapper; +package me.zhengjie.modules.wms.customerOrder.service.mapper; import me.zhengjie.mapper.EntityMapper; -import me.zhengjie.modules.wms.order.domain.CustomerOrderProduct; -import me.zhengjie.modules.wms.order.service.dto.CustomerOrderProductDTO; +import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrderProduct; +import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderProductDTO; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/request/CreateCustomerOrderRequest.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/request/CreateCustomerOrderRequest.java similarity index 55% rename from eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/request/CreateCustomerOrderRequest.java rename to eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/request/CreateCustomerOrderRequest.java index 78ec216a..5261fc02 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/request/CreateCustomerOrderRequest.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/request/CreateCustomerOrderRequest.java @@ -1,8 +1,8 @@ -package me.zhengjie.modules.wms.order.service.request; +package me.zhengjie.modules.wms.customerOrder.service.request; import lombok.Data; -import me.zhengjie.modules.wms.order.domain.CustomerOrder; -import me.zhengjie.modules.wms.order.domain.CustomerOrderProduct; +import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrderProduct; +import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrder; import java.util.List;