From b907ba5b12a98e31d56c8847769875906a682b98 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 15 四月 2020 16:49:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/InviteOrderSubsidyMapper.xml | 58 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 19 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/order/InviteOrderSubsidyMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/order/InviteOrderSubsidyMapper.xml
index 1e3e4c9..da8d0f8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/order/InviteOrderSubsidyMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/order/InviteOrderSubsidyMapper.xml
@@ -42,6 +42,15 @@
from yeshi_ec_invite_order_subsidy where os_order_no = #{orderNo} AND
os_source_type = #{type}
</select>
+
+ <select id="listByOrderNoAndTypeAndUid" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List" />
+ from yeshi_ec_invite_order_subsidy where os_order_no = #{orderNo} AND
+ os_source_type = #{type} and os_uid=#{uid}
+ </select>
+
+
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
yeshi_ec_invite_order_subsidy where os_id = #{id,jdbcType=BIGINT}
</delete>
@@ -126,19 +135,22 @@
</update>
<select id="getByOrderNoAndType" resultMap="BaseResultMap">SELECT * FROM
yeshi_ec_invite_order_subsidy WHERE os_uid = #{uid} AND os_order_no =
- #{orderNo} AND os_source_type = #{type} LIMIT 1</select>
+ #{orderNo} AND os_source_type = #{type} LIMIT 1
+ </select>
<select id="getByOrderNoAndTypeForUpdate" resultMap="BaseResultMap">SELECT *
FROM yeshi_ec_invite_order_subsidy WHERE os_uid = #{uid} AND
os_order_no = #{orderNo} AND os_source_type = #{type} for update
</select>
<select id="countByOrderNoAndType" resultType="java.lang.Long">SELECT count(*)
FROM yeshi_ec_invite_order_subsidy WHERE os_order_no = #{orderNo} AND
- os_source_type = #{type}</select>
-
-
+ os_source_type = #{type}
+ </select>
+
+
<select id="sumValidMoneyByUidAndDate" resultType="BigDecimal">
SELECT SUM(d.`os_money`) FROM yeshi_ec_invite_order_subsidy d
- WHERE d.`os_uid` = #{uid} AND (d.`os_state` = 1 OR d.`os_state` = 3)
+ WHERE
+ d.`os_uid` = #{uid} AND (d.`os_state` = 1 OR d.`os_state` = 3)
<if test="level != null">
AND d.os_level = #{level}
</if>
@@ -149,17 +161,21 @@
AND TO_DAYS(NOW()) - TO_DAYS(d.`os_valid_time`) = 1
</if>
<if test="day == 3"> <!-- 鏈湀 -->
- AND DATE_FORMAT(d.`os_valid_time`,'%Y%m') = DATE_FORMAT(CURDATE(),'%Y%m')
+ AND DATE_FORMAT(d.`os_valid_time`,'%Y%m') =
+ DATE_FORMAT(CURDATE(),'%Y%m')
</if>
<if test="day == 4"> <!-- 涓婃湀 -->
- AND PERIOD_DIFF(DATE_FORMAT(NOW(),'%Y%m'),DATE_FORMAT(d.`os_valid_time`, '%Y%m')) = 1
+ AND
+ PERIOD_DIFF(DATE_FORMAT(NOW(),'%Y%m'),DATE_FORMAT(d.`os_valid_time`,
+ '%Y%m')) = 1
</if>
- </select>
-
-
+ </select>
+
+
<select id="sumMoneyByUidAndDateAndState" resultType="BigDecimal">
SELECT SUM(d.`os_money`) FROM yeshi_ec_invite_order_subsidy d
- WHERE d.`os_uid` = #{uid} AND d.`os_state` = #{state}
+ WHERE
+ d.`os_uid` = #{uid} AND d.`os_state` = #{state}
<if test="level != null">
AND d.os_level = #{level}
</if>
@@ -170,20 +186,24 @@
AND TO_DAYS(NOW()) - TO_DAYS(d.`os_valid_time`) = 1
</if>
<if test="day == 3"> <!-- 鏈湀 -->
- AND DATE_FORMAT(d.`os_valid_time`,'%Y%m') = DATE_FORMAT(CURDATE(),'%Y%m')
+ AND DATE_FORMAT(d.`os_valid_time`,'%Y%m') =
+ DATE_FORMAT(CURDATE(),'%Y%m')
</if>
<if test="day == 4"> <!-- 涓婃湀 -->
- AND PERIOD_DIFF(DATE_FORMAT(NOW(),'%Y%m'),DATE_FORMAT(d.`os_valid_time`, '%Y%m')) = 1
+ AND
+ PERIOD_DIFF(DATE_FORMAT(NOW(),'%Y%m'),DATE_FORMAT(d.`os_valid_time`,
+ '%Y%m')) = 1
</if>
- </select>
-
-
+ </select>
+
+
<select id="sumRecievedMoneyByUid" resultType="BigDecimal">
SELECT SUM(d.`os_money`) FROM yeshi_ec_invite_order_subsidy d
- WHERE d.`os_uid` = #{uid} AND d.`os_state` = 3
+ WHERE
+ d.`os_uid` = #{uid} AND d.`os_state` = 3
<if test="level != null">
AND d.os_level = #{level}
</if>
- </select>
-
+ </select>
+
</mapper>
--
Gitblit v1.8.0