github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

修改客户订单-- 修改后的产品在原来中不存在

pull/451/head
starrysky 2019-08-17 14:33:03 +08:00
parent da13d41e39
commit 15311a828e
19 changed files with 59 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/domain/CustomerOrder.java → eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/domain/CustomerOrder.java
View File

@ -1,4 +1,4 @@
package me.zhengjie.modules.wms.order.domain; package me.zhengjie.modules.wms.customerOrder.domain;
import lombok.Data; import lombok.Data;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;

2
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/domain/CustomerOrderProduct.java → eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/domain/CustomerOrderProduct.java
View File

@ -1,4 +1,4 @@
package me.zhengjie.modules.wms.order.domain; package me.zhengjie.modules.wms.customerOrder.domain;
import lombok.Data; import lombok.Data;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;

4
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/repository/CustomerOrderProductRepository.java → eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/repository/CustomerOrderProductRepository.java
View File

@ -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.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Modifying;

4
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/repository/CustomerOrderRepository.java → eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/repository/CustomerOrderRepository.java
View File

@ -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.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Modifying;

4
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/request/CreateCustomerOrderRequest.java → eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/request/CreateCustomerOrderRequest.java
View File

@ -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.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.bean.copier.CopyOptions;
import lombok.Data; 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.sql.Timestamp;
import java.util.List; import java.util.List;

2
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/request/CustomerOrderProductRequest.java → eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/request/CustomerOrderProductRequest.java
View File

@ -1,4 +1,4 @@
package me.zhengjie.modules.wms.order.request; package me.zhengjie.modules.wms.customerOrder.request;
import lombok.Data; import lombok.Data;

4
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/request/UpdateCustomerOrderRequest.java → eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/request/UpdateCustomerOrderRequest.java
View File

@ -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.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.bean.copier.CopyOptions;
import lombok.Data; 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.io.Serializable;
import java.sql.Timestamp; import java.sql.Timestamp;

12
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/rest/CustomerOrderController.java → eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/rest/CustomerOrderController.java
View File

@ -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.aop.log.Log;
import me.zhengjie.modules.wms.order.domain.CustomerOrder; import me.zhengjie.modules.wms.customerOrder.request.UpdateCustomerOrderRequest;
import me.zhengjie.modules.wms.order.request.CreateCustomerOrderRequest; import me.zhengjie.modules.wms.customerOrder.service.CustomerOrderService;
import me.zhengjie.modules.wms.order.request.UpdateCustomerOrderRequest; import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderQueryCriteria;
import me.zhengjie.modules.wms.order.service.CustomerOrderService; import me.zhengjie.modules.wms.customerOrder.request.CreateCustomerOrderRequest;
import me.zhengjie.modules.wms.order.service.dto.CustomerOrderQueryCriteria;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*; import io.swagger.annotations.*;

8
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/CustomerOrderProductService.java → eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/CustomerOrderProductService.java
View File

@ -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.CacheConfig;
//import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.CacheEvict;
//import org.springframework.cache.annotation.Cacheable; //import org.springframework.cache.annotation.Cacheable;
import me.zhengjie.modules.wms.order.domain.CustomerOrderProduct; import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrderProduct;
import me.zhengjie.modules.wms.order.service.dto.CustomerOrderProductDTO; import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderProductDTO;
import me.zhengjie.modules.wms.order.service.dto.CustomerOrderProductQueryCriteria; import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderProductQueryCriteria;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
/** /**

11
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/CustomerOrderService.java → eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/CustomerOrderService.java
View File

@ -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.CacheConfig;
//import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.CacheEvict;
//import org.springframework.cache.annotation.Cacheable; //import org.springframework.cache.annotation.Cacheable;
import me.zhengjie.modules.wms.order.domain.CustomerOrder; import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderQueryCriteria;
import me.zhengjie.modules.wms.order.request.CreateCustomerOrderRequest; import me.zhengjie.modules.wms.customerOrder.request.CreateCustomerOrderRequest;
import me.zhengjie.modules.wms.order.request.UpdateCustomerOrderRequest; import me.zhengjie.modules.wms.customerOrder.request.UpdateCustomerOrderRequest;
import me.zhengjie.modules.wms.order.service.dto.CustomerOrderDTO; import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderDTO;
import me.zhengjie.modules.wms.order.service.dto.CustomerOrderQueryCriteria;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
/** /**

2
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/dto/CustomerOrderDTO.java → eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderDTO.java
View File

@ -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.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.bean.copier.CopyOptions;

2
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/dto/CustomerOrderProductDTO.java → eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderProductDTO.java
View File

@ -1,5 +1,5 @@
package me.zhengjie.modules.wms.order.service.dto; package me.zhengjie.modules.wms.customerOrder.service.dto;
import lombok.Data; import lombok.Data;

2
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/dto/CustomerOrderProductQueryCriteria.java → eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderProductQueryCriteria.java
View File

@ -1,4 +1,4 @@
package me.zhengjie.modules.wms.order.service.dto; package me.zhengjie.modules.wms.customerOrder.service.dto;
import lombok.Data; import lombok.Data;
import java.sql.Timestamp; import java.sql.Timestamp;

2
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/dto/CustomerOrderQueryCriteria.java → eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderQueryCriteria.java
View File

@ -1,4 +1,4 @@
package me.zhengjie.modules.wms.order.service.dto; package me.zhengjie.modules.wms.customerOrder.service.dto;
import lombok.Data; import lombok.Data;
import java.sql.Timestamp; import java.sql.Timestamp;

14
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/impl/CustomerOrderProductServiceImpl.java → eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderProductServiceImpl.java
View File

@ -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.customerOrder.domain.CustomerOrderProduct;
import me.zhengjie.modules.wms.order.repository.CustomerOrderProductRepository; import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderProductQueryCriteria;
import me.zhengjie.modules.wms.order.service.CustomerOrderProductService; import me.zhengjie.modules.wms.customerOrder.service.mapper.CustomerOrderProductMapper;
import me.zhengjie.modules.wms.order.service.dto.CustomerOrderProductDTO; import me.zhengjie.modules.wms.customerOrder.repository.CustomerOrderProductRepository;
import me.zhengjie.modules.wms.order.service.dto.CustomerOrderProductQueryCriteria; import me.zhengjie.modules.wms.customerOrder.service.CustomerOrderProductService;
import me.zhengjie.modules.wms.order.service.mapper.CustomerOrderProductMapper; import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderProductDTO;
import me.zhengjie.utils.ValidationUtil; import me.zhengjie.utils.ValidationUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

28
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/impl/CustomerOrderServiceImpl.java → eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java
View File

@ -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.exception.BadRequestException;
import me.zhengjie.modules.wms.order.domain.CustomerOrder; import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrderProduct;
import me.zhengjie.modules.wms.order.domain.CustomerOrderProduct; import me.zhengjie.modules.wms.customerOrder.repository.CustomerOrderRepository;
import me.zhengjie.modules.wms.order.repository.CustomerOrderProductRepository; import me.zhengjie.modules.wms.customerOrder.request.UpdateCustomerOrderRequest;
import me.zhengjie.modules.wms.order.repository.CustomerOrderRepository; import me.zhengjie.modules.wms.customerOrder.service.CustomerOrderService;
import me.zhengjie.modules.wms.order.request.CreateCustomerOrderRequest; import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderProductDTO;
import me.zhengjie.modules.wms.order.request.CustomerOrderProductRequest; import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderQueryCriteria;
import me.zhengjie.modules.wms.order.request.UpdateCustomerOrderRequest; import me.zhengjie.modules.wms.customerOrder.service.mapper.CustomerOrderProductMapper;
import me.zhengjie.modules.wms.order.service.CustomerOrderService; import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrder;
import me.zhengjie.modules.wms.order.service.dto.CustomerOrderDTO; import me.zhengjie.modules.wms.customerOrder.repository.CustomerOrderProductRepository;
import me.zhengjie.modules.wms.order.service.dto.CustomerOrderProductDTO; import me.zhengjie.modules.wms.customerOrder.request.CreateCustomerOrderRequest;
import me.zhengjie.modules.wms.order.service.dto.CustomerOrderQueryCriteria; import me.zhengjie.modules.wms.customerOrder.request.CustomerOrderProductRequest;
import me.zhengjie.modules.wms.order.service.mapper.CustomerOrderMapper; import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderDTO;
import me.zhengjie.modules.wms.order.service.mapper.CustomerOrderProductMapper; import me.zhengjie.modules.wms.customerOrder.service.mapper.CustomerOrderMapper;
import me.zhengjie.utils.ValidationUtil; import me.zhengjie.utils.ValidationUtil;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

6
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/mapper/CustomerOrderMapper.java → eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/mapper/CustomerOrderMapper.java
View File

@ -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.mapper.EntityMapper;
import me.zhengjie.modules.wms.order.domain.CustomerOrder; import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderDTO;
import me.zhengjie.modules.wms.order.service.dto.CustomerOrderDTO; import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrder;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy; import org.mapstruct.ReportingPolicy;

6
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/mapper/CustomerOrderProductMapper.java → eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/mapper/CustomerOrderProductMapper.java
View File

@ -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.mapper.EntityMapper;
import me.zhengjie.modules.wms.order.domain.CustomerOrderProduct; import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrderProduct;
import me.zhengjie.modules.wms.order.service.dto.CustomerOrderProductDTO; import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderProductDTO;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy; import org.mapstruct.ReportingPolicy;

6
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/request/CreateCustomerOrderRequest.java → eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/request/CreateCustomerOrderRequest.java
View File

@ -1,8 +1,8 @@
package me.zhengjie.modules.wms.order.service.request; package me.zhengjie.modules.wms.customerOrder.service.request;
import lombok.Data; import lombok.Data;
import me.zhengjie.modules.wms.order.domain.CustomerOrder; import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrderProduct;
import me.zhengjie.modules.wms.order.domain.CustomerOrderProduct; import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrder;
import java.util.List; import java.util.List;