From 86e46bc28e78b3a883132816e23dbcca37f9ca3a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 05 一月 2019 14:24:15 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/mapping/share/ShareMapper.xml | 98 +++++++++++++++++++-----------------------------
1 files changed, 39 insertions(+), 59 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/share/ShareMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/share/ShareMapper.xml
index 32cc7ea..58b1e22 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/share/ShareMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/share/ShareMapper.xml
@@ -87,7 +87,8 @@
FROM
`yeshi_ec_share_tao_password` yestp
WHERE
- yestp.`auctionId` = #{auctionId}
+ yestp.`auctionId` =
+ #{auctionId}
AND
yestp.`pid` = #{pid};
</select>
@@ -99,7 +100,8 @@
FROM
`yeshi_ec_share_tao_password` yestp
WHERE
- yestp.`auctionId` = #{auctionId}
+ yestp.`auctionId` =
+ #{auctionId}
AND
yestp.`pid` = #{pid};
</select>
@@ -137,7 +139,8 @@
FROM
`yeshi_ec_threesale` yet
WHERE
- yet.`boss_id` = #{uid}
+ yet.`boss_id` =
+ #{uid}
AND
yet.`state` = '1'
</select>
@@ -149,7 +152,8 @@
FROM
`yeshi_ec_threesale` yet
WHERE
- yet.`boss_id` = ANY(
+ yet.`boss_id` =
+ ANY(
SELECT
yet.`worker_id`
FROM
@@ -166,78 +170,52 @@
<!-- 鏌ヨ鎴戠殑浠婃棩鏀剁泭 -->
<select id="getMoneyToday" resultType="java.math.BigDecimal">
SELECT
- SUM(yeh.`money`)
+ SUM(yeh.`hb_money`)
FROM
- `yeshi_ec_hongbao` yeh
+ `yeshi_ec_hongbao_v2` yeh
WHERE
- (yeh.`state` = '1' OR yeh.`state` = '2' OR yeh.`state` = '3')
+ (yeh.`hb_state` = '1' OR yeh.`hb_state`
+ = '2' OR yeh.`hb_state` = '3')
AND
- (yeh.`type` = '6' OR yeh.`type` = '7' OR yeh.`type` = '20' OR yeh.`type` = '21' OR yeh.`type` = '22')
+ (yeh.`hb_type` = '6' OR yeh.`hb_type`
+ = '7' OR yeh.`hb_type` = '20' OR yeh.`hb_type` = '21' OR yeh.`hb_type`
+ = '22')
AND
- yeh.`uid` = #{uid}
+ yeh.`hb_uid` = #{uid}
AND
- FROM_UNIXTIME(yeh.createtime/1000,'%Y-%m-%d') = FROM_UNIXTIME(UNIX_TIMESTAMP(),'%Y-%m-%d');
+ FROM_UNIXTIME(yeh.hb_create_time/1000,'%Y-%m-%d') =
+ FROM_UNIXTIME(UNIX_TIMESTAMP(),'%Y-%m-%d');
</select>
<!-- 鏌ヨ鎴戠殑鏈湀棰勪及鏀剁泭 -->
<select id="getMoneyMonth" resultType="java.math.BigDecimal">
SELECT
- SUM(yeh.`money`)
+ SUM(yeh.`hb_money`)
FROM
- `yeshi_ec_hongbao` yeh
+ `yeshi_ec_hongbao_v2` yeh
WHERE
- (yeh.`state` = '1' OR yeh.`state` = '2' OR yeh.`state` = '3')
+ (yeh.`hb_state` = '1' OR
+ yeh.`hb_state` = '2' OR yeh.`hb_state` = '3')
AND
- (yeh.`type` = '6' OR yeh.`type` = '7' OR yeh.`type` = '20' OR yeh.`type` = '21' OR yeh.`type` = '22')
+ (yeh.`hb_type` = '6'
+ OR yeh.`hb_type` = '7' OR yeh.`hb_type` = '20' OR yeh.`hb_type` = '21'
+ OR yeh.`hb_type` = '22')
AND
- yeh.`uid` = #{uid}
+ yeh.`hb_uid` = #{uid}
AND
- FROM_UNIXTIME(yeh.createtime/1000,'%Y-%m') = FROM_UNIXTIME(UNIX_TIMESTAMP(),'%Y-%m');
+ FROM_UNIXTIME(yeh.hb_create_time/1000,'%Y-%m') =
+ FROM_UNIXTIME(UNIX_TIMESTAMP(),'%Y-%m');
</select>
<!-- 鏌ヨ鎴戠殑涓婃湀棰勪及鏀剁泭 -->
<select id="getMoneyLastMonth" resultType="java.math.BigDecimal">
SELECT
- (SELECT
- IF(
- SUM(h.`money`) IS NULL,
- 0,
- SUM(h.`money`)
- )
- FROM
- `yeshi_ec_hongbao` h
- LEFT JOIN yeshi_ec_hongbao hp
- ON hp.`id` = h.`pid`
- WHERE h.uid = #{uid}
- AND (
- h.state = 1
- OR h.state = 2
- OR h.state = 3
- )
- AND (h.`type` = 6
- OR h.`type` = 7)
- AND hp.`balance_time` IS NOT NULL
- AND DATE_FORMAT(hp.`balance_time`, '%Y-%m') = DATE_FORMAT(
- DATE_SUB(CURDATE(), INTERVAL 1 MONTH),
- '%Y-%m'
- )) +
- (SELECT
- IF(SUM(h.money) IS NULL, 0, SUM(h.money))
- FROM
- yeshi_ec_hongbao h
- WHERE h.uid = #{uid}
- AND (h.type = 20 OR h.type = 21 OR h.type = 22)
- AND (
- h.state = 1
- OR h.state = 2
- OR h.state = 3
- )
- AND h.`balance_time` IS NOT NULL
- AND DATE_FORMAT(h.`balance_time`, '%Y-%m') = DATE_FORMAT(
- DATE_SUB(CURDATE(), INTERVAL 1 MONTH),
- '%Y-%m'
- ))
+ SUM(h.`hb_money`) FROM yeshi_ec_hongbao_v2 h WHERE h.`hb_uid`=#{0}
+ AND (h.`hb_state`=1 OR h.`hb_state`=2 OR h.`hb_state`=3) AND
+ (h.`hb_type`=6 OR h.`hb_type`=7 OR h.`hb_type`=20 OR h.`hb_type`=21 OR
+ h.`hb_type`=22 ) AND h.`hb_pre_get_time` IS NOT NULL AND
+ DATE_FORMAT(h.`hb_pre_get_time`,'%Y-%m')=DATE_FORMAT(NOW(),'%Y-%m');
</select>
@@ -321,15 +299,17 @@
SELECT counts FROM
`yeshi_ec_recommend_section` WHERE id = #{key};
</select>
-
+
<!-- 鏌ヨ娲诲姩瑙勫垯 -->
<select id="getActivityRules" resultType="String">
- SELECT yesc.`value` FROM `yeshi_ec_system_clientparams` yesc WHERE yesc.`key` = #{key};
+ SELECT yesc.`value`
+ FROM `yeshi_ec_system_clientparams` yesc WHERE yesc.`key` = #{key};
</select>
-
+
<!-- 淇敼娲诲姩瑙勫垯 -->
<update id="editActivityRules">
- UPDATE `yeshi_ec_system_clientparams` yesc SET yesc.`value` = #{value} WHERE yesc.`key` = #{key};
+ UPDATE `yeshi_ec_system_clientparams` yesc SET
+ yesc.`value` = #{value} WHERE yesc.`key` = #{key};
</update>
--
Gitblit v1.8.0