From eb706a988e747b624fda0d44e0aaf6a4ee5e20eb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 26 May 2022 11:27:03 +0800
Subject: [PATCH] fix saveOrder zkPrice is null

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java |   19 +++++++++++++++++++
 1 files changed, 19 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 a47e379..efe99c6 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
@@ -35,6 +35,8 @@
 import com.matrix.system.hive.plugin.util.CollectionUtils;
 import com.matrix.system.hive.pojo.CzXkVo;
 import com.matrix.system.hive.service.*;
+import com.matrix.system.padApi.dto.PadOrderListDto;
+import com.matrix.system.padApi.vo.PadOrderDetailVo;
 import com.matrix.system.score.service.ScoreVipDetailService;
 import com.matrix.system.shopXcx.mqTask.AsyncMessageRouting;
 import com.matrix.system.wechart.templateMsg.UniformMsgParam;
@@ -514,11 +516,28 @@
     }
 
     @Override
+    public List<PadOrderDetailVo> findPadApiOrderListInPage(PadOrderListDto orderListDto, PaginationVO pageVo) {
+        List<PadOrderDetailVo> padOrderDetailVos = sysOrderDao.selectPadApiOrderListInPage(orderListDto, pageVo);
+        if(CollUtil.isNotEmpty(padOrderDetailVos)){
+            for(PadOrderDetailVo padOrderDetailVo : padOrderDetailVos){
+                padOrderDetailVo.setItems(orderItemDao.selectApiOrderDetailItemsByOrderId(Long.parseLong(padOrderDetailVo.getOrderId())));
+            }
+        }
+
+        return padOrderDetailVos;
+    }
+
+    @Override
     public int findApiOrderListTotal(OrderListDto orderListDto) {
         return sysOrderDao.selectApiOrderListTotal(orderListDto);
     }
 
     @Override
+    public int findPadApiOrderListTotal(PadOrderListDto orderListDto) {
+        return sysOrderDao.selectPadApiOrderListTotal(orderListDto);
+    }
+
+    @Override
     public OrderDetailVo findApiOrderDetailByOrderId(Long orderId) {
         OrderDetailVo orderDetail = sysOrderDao.selectApiOrderDetailById(orderId);
 

--
Gitblit v1.9.1