From f7ea5773570beb5ad8c6efb5c1cf743294ee079b Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 24 Jan 2021 14:16:04 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 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 208e3ec..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>
@@ -519,5 +520,31 @@
group by c.id ,f.id) t
</select>
+ <select id="selectApiOrderDetailItemsByOrderId" resultType="com.matrix.system.app.vo.OrderDetailItemVo">
+ select
+ a.id id,
+ b.name goodsName,
+ a.COUNT count,
+ a.cash_Pay cashPay,
+ a.card_Pay cardPay,
+ a.PRICE price,
+ a.ZK_PRICE zkPrice,
+ a.status status
+ from sys_order_item a
+ inner join shopping_goods b on a.goods_id=b.id
+ 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