From 236fe234fac0fb33b1caa24ed80d74d47a2cc68e Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 19 Jan 2021 09:26:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml
index f532adf..6be411c 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml
@@ -535,4 +535,16 @@
         where a.ORDER_ID=#{orderId};
     </select>
 
+    <select id="selectErpOrderItemByOrderId"
+            resultType="com.matrix.system.shopXcx.api.vo.ErpOrderDetailItemVo">
+            select
+               b.name goodsName,
+               a.COUNT count,
+               a.PRICE price,
+               a.ZK_PRICE zkPrice
+        from sys_order_item a
+        inner join shopping_goods b on a.goods_id=b.id
+        where a.ORDER_ID=#{orderId}
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1