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

- 修改订单 page 返回类，增加 total 条数

Browse Source
This commit is contained in:
sin
2019-03-28 00:44:52 +08:00
parent e2a19a1d9d
commit 1900ccafe2
8 changed files with 345 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
order/order-service-impl/src/main/java/cn/iocoder/mall/order/application/convert/OrderConvert.java
View File

@@ -1,6 +1,6 @@
package cn.iocoder.mall.order.application.convert;
import cn.iocoder.mall.order.api.dto.OrderPageBO;
import cn.iocoder.mall.order.api.dto.OrderBO;
import cn.iocoder.mall.order.dataobject.OrderDO;
import org.mapstruct.Mapper;
import org.mapstruct.Mappings;
@@ -20,5 +20,5 @@ public interface OrderConvert {
OrderConvert INSTANCE = Mappers.getMapper(OrderConvert.class);
@Mappings({})
List<OrderPageBO> convertPageBO(List<OrderDO> orderDOList);
List<OrderBO> convertPageBO(List<OrderDO> orderDOList);
}

18
order/order-service-impl/src/main/java/cn/iocoder/mall/order/service/OrderServiceImpl.java
View File

@@ -5,7 +5,6 @@ import cn.iocoder.common.framework.util.ServiceExceptionUtil;
import cn.iocoder.common.framework.vo.CommonResult;
import cn.iocoder.mall.order.OrderCommon;
import cn.iocoder.mall.order.api.OrderService;
import cn.iocoder.mall.order.api.bo.OrderBO;
import cn.iocoder.mall.order.api.constant.OrderErrorCodeEnum;
import cn.iocoder.mall.order.api.constant.OrderHasReturnExchangeEnum;
import cn.iocoder.mall.order.api.constant.OrderStatusEnum;
@@ -47,21 +46,26 @@ public class OrderServiceImpl implements OrderService {
private OrderCommon orderCommon;
@Override
public CommonResult<List<OrderPageBO>> getOrderPage(OrderQueryDTO orderQueryDTO) {
public CommonResult<OrderPageBO> getOrderPage(OrderQueryDTO orderQueryDTO) {
int totalCount = orderMapper.selectPageCount(orderQueryDTO);
if (totalCount == 0) {
return CommonResult.success(Collections.EMPTY_LIST);
return CommonResult.success(new OrderPageBO().setTotal(0));
}
List<OrderDO> orderDOList = orderMapper.selectPage(orderQueryDTO);
List<OrderPageBO> orderPageBOList = OrderConvert.INSTANCE.convertPageBO(orderDOList);
return CommonResult.success(orderPageBOList);
List<OrderBO> orderPageBOList = OrderConvert.INSTANCE.convertPageBO(orderDOList);
return CommonResult.success(
new OrderPageBO()
.setTotal(totalCount)
.setOrders(orderPageBOList)
);
}
@Override
@Transactional
public CommonResult<OrderBO> createOrder(Integer userId, OrderCreateDTO orderCreateDTO) {
public CommonResult<cn.iocoder.mall.order.api.bo.OrderBO> createOrder(Integer userId, OrderCreateDTO orderCreateDTO) {
List<OrderCreateItemDTO> orderItemDTOList = orderCreateDTO.getOrderItems();
OrderLogisticsDO orderLogisticsDO = OrderLogisticsConvert.INSTANCE.convert(orderCreateDTO);
List<OrderItemDO> orderItemDOList = OrderItemConvert.INSTANCE.convert(orderItemDTOList);
@@ -139,7 +143,7 @@ public class OrderServiceImpl implements OrderService {
// TODO: 2019-03-17 Sin 需要发送 创建成果 MQ 消息
return CommonResult.success(
new OrderBO()
new cn.iocoder.mall.order.api.bo.OrderBO()
.setId(orderDO.getId())
.setOrderNo(orderDO.getOrderNo())
.setMoney(orderDO.getPrice())