From c540d1f16d86a0391f9a51ee505ce6866e20ffbd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 24 Dec 2020 17:00:44 +0800
Subject: [PATCH] finish order detail and goods detail
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
index d03e648..250b154 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
@@ -7,6 +7,8 @@
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.OrderListDto;
+import com.matrix.system.app.vo.OrderDetailAchieveItemVo;
+import com.matrix.system.app.vo.OrderDetailItemVo;
import com.matrix.system.app.vo.OrderDetailVo;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.dao.BusParameterSettingsDao;
@@ -80,6 +82,9 @@
@Autowired
private AchieveNewService achieveNewService;
+
+ @Autowired
+ private AchieveNewDao achieveNewDao;
@Autowired
private WarehouseDao warehouseDao;
@@ -1225,4 +1230,24 @@
public int findApiOrderListTotal(OrderListDto orderListDto) {
return sysOrderDao.selectApiOrderListTotal(orderListDto);
}
+
+ @Override
+ public OrderDetailVo findApiOrderDetailByOrderId(Long orderId) {
+ OrderDetailVo orderDetail = sysOrderDao.selectApiOrderDetailById(orderId);
+
+ if (orderDetail == null) {
+ throw new GlobleException("该订单不存在");
+ }
+
+ List<OrderDetailItemVo> items = orderItemDao.selectApiOrderDetailItemsByOrderId(orderId);
+ if (CollectionUtils.isNotEmpty(items)) {
+ for (OrderDetailItemVo item : items) {
+ List<OrderDetailAchieveItemVo> achieveItems = achieveNewDao.selectApiOrderItemAchieve(item.getId());
+ item.setAchieves(achieveItems);
+ }
+ }
+
+ orderDetail.setItems(items);
+ return orderDetail;
+ }
}
--
Gitblit v1.9.1