From 4f1a0c89b40a99e7e3b6ec72b42a1b9d6bac971a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 28 Jan 2021 15:36:19 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 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 656ad77..6be411c 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml
@@ -33,6 +33,7 @@
                      resultMap="com.matrix.system.hive.dao.ShoppingGoodsDao.ShoppingGoodsSimpleMap"></association>
 
 
+
     </resultMap>
 
     <!-- 查询会员待处理的订单商品 -->
@@ -128,7 +129,7 @@
             <if test="orderId != null and orderId !='' ">
                 ORDER_ID = #{orderId},
             </if>
-            <if test="count != null and count !='' ">
+            <if test="count != null and count !='' or count == 0 ">
                 COUNT = #{count},
             </if>
             <if test="isFree != null and isFree !='' ">
@@ -250,11 +251,11 @@
 		g.is_course,
 		g.car_use_count,
 		g.good_type,
-		g.code
-
-
+		g.code,
+		g.goods_no,
+		g.name
 		from sys_order_item i
-		left  join shopping_goods g on i.goods_id=g.id
+		left join shopping_goods g on i.goods_id=g.id
 		where ORDER_ID =#{orderId}
 	</select>
 
@@ -534,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