oneos-v5/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- 优化订单查询，和 convert 转换

Browse Source
This commit is contained in:
sin
2019-03-24 16:58:24 +08:00
parent 6cc00a373b
commit e9b5adeac3
26 changed files with 211 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
order/order-application/src/main/java/cn/iocoder/mall/order/OrderApplication.java → order/order-application/src/main/java/cn/iocoder/mall/order/application/OrderApplication.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.mall.order;
package cn.iocoder.mall.order.application;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;

2
order/order-application/src/main/java/cn/iocoder/mall/order/config/MVCConfiguration.java → order/order-application/src/main/java/cn/iocoder/mall/order/application/config/MVCConfiguration.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.mall.order.config;
package cn.iocoder.mall.order.application.config;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.*;

2
order/order-application/src/main/java/cn/iocoder/mall/order/config/SwaggerConfiguration.java → order/order-application/src/main/java/cn/iocoder/mall/order/application/config/SwaggerConfiguration.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.mall.order.config;
package cn.iocoder.mall.order.application.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

20
order/order-application/src/main/java/cn/iocoder/mall/order/controller/admins/AdminsOrderController.java → order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/admins/AdminsOrderController.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.mall.order.controller.admins;
package cn.iocoder.mall.order.application.controller.admins;
import cn.iocoder.common.framework.vo.CommonResult;
import cn.iocoder.mall.order.api.OrderService;
@@ -6,10 +6,10 @@ import cn.iocoder.mall.order.api.dto.OrderItemUpdateDTO;
import cn.iocoder.mall.order.api.dto.OrderLogisticsUpdateDTO;
import cn.iocoder.mall.order.api.dto.OrderPageBO;
import cn.iocoder.mall.order.api.dto.OrderQueryDTO;
import cn.iocoder.mall.order.convert.OrderConvert;
import cn.iocoder.mall.order.vo.OrderItemUpdateVO;
import cn.iocoder.mall.order.vo.OrderLogisticsVO;
import cn.iocoder.mall.order.vo.OrderPageQueryVO;
import cn.iocoder.mall.order.application.convert.OrderConvertAPP;
import cn.iocoder.mall.order.application.vo.OrderItemUpdateVO;
import cn.iocoder.mall.order.application.vo.OrderLogisticsVO;
import cn.iocoder.mall.order.application.vo.OrderPageQueryVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,23 +34,23 @@ public class AdminsOrderController {
@GetMapping("page")
@ApiOperation("订单列表")
public CommonResult<List<OrderPageBO>> getOrderPage(@RequestBody OrderPageQueryVO orderPageQueryVO) {
OrderQueryDTO orderQueryDTO = OrderConvert.INSTANCE.convertPageBO(orderPageQueryVO);
public CommonResult<List<OrderPageBO>> getOrderPage(@Validated OrderPageQueryVO orderPageQueryVO) {
OrderQueryDTO orderQueryDTO = OrderConvertAPP.INSTANCE.convertPageBO(orderPageQueryVO);
CommonResult<List<OrderPageBO>> result = orderService.getOrderPage(orderQueryDTO);
return result;
}
@PutMapping("order/update")
@PutMapping("order_item/update")
@ApiOperation("订单item更新")
public CommonResult updateOrderItem(@RequestBody @Validated OrderItemUpdateVO orderItemUpdateVO) {
OrderItemUpdateDTO dto = OrderConvert.INSTANCE.convertPageBO(orderItemUpdateVO);
OrderItemUpdateDTO dto = OrderConvertAPP.INSTANCE.convertPageBO(orderItemUpdateVO);
return orderService.updateOrderItem(dto);
}
@PutMapping("logistics/update")
@ApiOperation("订单物流更新")
public CommonResult updateLogistics(@RequestBody @Validated OrderLogisticsVO orderLogisticsVO) {
OrderLogisticsUpdateDTO dto = OrderConvert.INSTANCE.convertPageBO(orderLogisticsVO);
OrderLogisticsUpdateDTO dto = OrderConvertAPP.INSTANCE.convertPageBO(orderLogisticsVO);
return orderService.updateLogistics(dto);
}
}

2
order/order-application/src/main/java/cn/iocoder/mall/order/controller/users/UsersOrderController.java → order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/UsersOrderController.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.mall.order.controller.users;
package cn.iocoder.mall.order.application.controller.users;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

34
order/order-application/src/main/java/cn/iocoder/mall/order/application/convert/OrderConvertAPP.java Normal file
View File

@@ -0,0 +1,34 @@
package cn.iocoder.mall.order.application.convert;
import cn.iocoder.mall.order.api.dto.OrderItemUpdateDTO;
import cn.iocoder.mall.order.api.dto.OrderLogisticsUpdateDTO;
import cn.iocoder.mall.order.api.dto.OrderQueryDTO;
import cn.iocoder.mall.order.application.vo.OrderItemUpdateVO;
import cn.iocoder.mall.order.application.vo.OrderLogisticsVO;
import cn.iocoder.mall.order.application.vo.OrderPageQueryVO;
import org.mapstruct.Mapper;
import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers;
/**
* application 订单 convert
*
* TODO 这种方式 文件名不能一样哈!
*
* @author Sin
* @time 2019-03-24 10:45
*/
@Mapper
public interface OrderConvertAPP {
OrderConvertAPP INSTANCE = Mappers.getMapper(OrderConvertAPP.class);
@Mappings({})
OrderQueryDTO convertPageBO(OrderPageQueryVO orderPageQueryVO);
@Mappings({})
OrderLogisticsUpdateDTO convertPageBO(OrderLogisticsVO orderLogisticsVO);
@Mappings({})
OrderItemUpdateDTO convertPageBO(OrderItemUpdateVO orderItemUpdateVO);
}

2
order/order-application/src/main/java/cn/iocoder/mall/order/vo/OrderItemUpdateVO.java → order/order-application/src/main/java/cn/iocoder/mall/order/application/vo/OrderItemUpdateVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.mall.order.vo;
package cn.iocoder.mall.order.application.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
order/order-application/src/main/java/cn/iocoder/mall/order/vo/OrderLogisticsVO.java → order/order-application/src/main/java/cn/iocoder/mall/order/application/vo/OrderLogisticsVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.mall.order.vo;
package cn.iocoder.mall.order.application.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

3
order/order-application/src/main/java/cn/iocoder/mall/order/vo/OrderPageQueryVO.java → order/order-application/src/main/java/cn/iocoder/mall/order/application/vo/OrderPageQueryVO.java
View File

@@ -1,6 +1,5 @@
package cn.iocoder.mall.order.vo;
package cn.iocoder.mall.order.application.vo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;