From 147999c063e913989a4b09f5e7884e11f680ace2 Mon Sep 17 00:00:00 2001
From: jiangyouyao <jiangyouyao>
Date: Wed, 06 Apr 2022 14:48:16 +0800
Subject: [PATCH] fix:修复赠送产品需要设置消耗金额的问题

---
 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml
index d2cd718..ba616cb 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml
@@ -548,7 +548,7 @@
 	</select>
 
 	<!-- 分页查询 -->
-	<select id="selectInPageByQuery" resultMap="ShopOrderMap">
+	<select id="selectInPageByQuery" resultMap="ShopOrderComplexMap">
 		select
 		o.*,
 		s.shop_name
@@ -756,6 +756,13 @@
 		group by order_status
 	</select>
 
+	<select id="selectShopOrderByOrderNo"  resultType="com.matrix.system.shopXcx.bean.ShopOrder"  >
+		select
+		a.*
+		from shop_order a
+		where a.order_no=#{orderNo}
+	</select>
+
 	<update id="batchUpdateOrderStatus">
 		<foreach collection="list" index="index" item="item" separator=";">
 			update shop_order set order_status=#{item.orderStatus}

--
Gitblit v1.9.1