From ecb361733a4f90ad1672c422577292a18c0fd2bb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 一月 2020 09:46:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
index c2f7ce4..0e5f827 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
@@ -452,7 +452,11 @@
<!-- 璁㈠崟鍙锋煡璇� -->
<if test="orderNo != null and orderNo !='' ">AND co.co_order_no = #{orderNo}</if>
<!-- 璁㈠崟鏉ユ簮 -->
- <if test="source != null">AND co.co_source_type = #{source}</if>
+ <if test="listSource != null and listSource.size() > 0">
+ <foreach collection="listSource" item="item" open="AND (" close=")" separator="or">
+ co.co_source_type = #{item}
+ </foreach>
+ </if>
GROUP BY co.`co_order_no`, co.`co_source_type` ORDER BY
co.co_third_create_time DESC LIMIT ${start},${count}
</select>
@@ -485,7 +489,11 @@
<!-- 璁㈠崟鍙锋煡璇� -->
<if test="orderNo != null and orderNo !='' ">AND co.co_order_no = #{orderNo}</if>
<!-- 璁㈠崟鏉ユ簮 -->
- <if test="source != null">AND co.co_source_type = #{source}</if>
+ <if test="listSource != null and listSource.size() > 0">
+ <foreach collection="listSource" item="item" open="AND (" close=")" separator="or">
+ co.co_source_type = #{item}
+ </foreach>
+ </if>
GROUP BY co.`co_order_no`, co.`co_source_type` )A
</select>
<select id="listOrderGoodsInfo" resultMap="ResultMap"
@@ -618,7 +626,11 @@
'%Y%m'),DATE_FORMAT(co.`co_settle_time`, '%Y%m')) = 1
</if>
<!-- 璁㈠崟鏉ユ簮 -->
- <if test="source != null and source != 0">AND co.co_source_type = #{source}</if>
+ <if test="listSource != null and listSource.size() > 0">
+ <foreach collection="listSource" item="item" open="AND (" close=")" separator="or">
+ co.co_source_type = #{item}
+ </foreach>
+ </if>
</sql>
<select id="getOrderCount" resultMap="OrderCountMap">
SELECT sum(self) as self,sum(shared) as shared,sum(invite) as invite
--
Gitblit v1.8.0