From e53fcbe9fe844b7788b29c5106c1ac24d17c5535 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 08 May 2021 22:40:19 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 b044a72..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
@@ -623,7 +623,7 @@
o.wx_order_no,
o.pay_result,
o.postage,
- o.pay_method
+ o.pay_method,
s.shop_name,
o.order_type
from shop_order o
@@ -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