From 34589cd092e0de8cfd704cd59608ed0f36f6093a Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Mon, 26 Oct 2020 09:56:30 +0800
Subject: [PATCH] Merge branch 'pay_master' into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
index 892860e..c80ed2f 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
@@ -264,7 +264,42 @@
ORDER BY
create_time DESC
</select>
-
+ <select id="getUserdProduct" resultType="int">
+ SELECT
+ sum(total)
+ FROM
+ (
+ SELECT
+ count(*) total
+ FROM
+ `product_order` order_order
+ LEFT JOIN product_order_record record ON order_order.id = record.order_id
+ WHERE
+ order_order.hospital_id = #{hospitalId}
+ AND order_order.department_id = #{departmentId}
+ and record.pro_id!=1000000000000000000
+ AND order_order.is_del = 0
+ AND order_order.enabled = 1
+ AND record.is_del = 0
+ AND record.enabled = 1
+ AND record.pro_endtime>now()
+ UNION ALL
+ SELECT
+ count(*) total
+ FROM
+ `product_order` order_order
+ LEFT JOIN product_order_record record ON order_order.id = record.order_id
+ WHERE
+ order_order.hospital_id = #{hospitalId}
+ AND record.is_share = 1
+ and record.pro_id!=1000000000000000000
+ AND order_order.is_del = 0
+ AND order_order.enabled = 1
+ AND record.is_del = 0
+ AND record.enabled = 1
+ AND record.pro_endtime>now()
+ ) cc
+ </select>
<select id="productEndList" resultType="com.kidgrow.oprationcenter.vo.ProductEndVo">
SELECT
id,
--
Gitblit v1.8.0