Skip to content

H
huhu-partner
Commit f932c479 by guanchen
Options

添加奖励类型

parent 04b7ff48
Showing with 51 additions and 60 deletions
pom.xml
......@@ -79,7 +79,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
<!--<scope>provided</scope>-->
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
......@@ -91,11 +91,11 @@
<artifactId>commons-pool2</artifactId>
<version>2.6.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
</dependency>
<!--<dependency>-->
<!--<groupId>org.springframework.boot</groupId>-->
<!--<artifactId>spring-boot-devtools</artifactId>-->
<!--<scope>runtime</scope>-->
<!--</dependency>-->
<!-- https://mvnrepository.com/artifact/com.alibaba/druid -->
<dependency>
<groupId>com.alibaba</groupId>
......@@ -132,11 +132,6 @@
<artifactId>snakeyaml</artifactId>
<version>1.24</version>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson</artifactId>
<version>3.7.5</version>
</dependency>
</dependencies>
<profiles>
......@@ -148,13 +143,11 @@
<mysql.server>jdbc:mysql://10.9.121.204:3306/huhu_finance</mysql.server>
<mysql.username>huhu_finance</mysql.username>
<mysql.password>huhu_finance</mysql.password>
<redis.host>10.9.186.167</redis.host>
<redis.password>passwdredis</redis.password>
<spring.profiles.active>dev</spring.profiles.active>
<logfile_path>/data/logs/java</logfile_path>
<!--<logfile_path>/Users/chen/Develop/workspace/partner/data/release/dev/logs</logfile_path>-->
<providers-path>/data/java/service</providers-path>
<!--<providers-path>/Users/chen/Develop/workspace/partner/data/release/dev</providers-path>-->
<!--<logfile_path>/data/logs/java</logfile_path>-->
<logfile_path>/Users/chen/Develop/workspace/partner/data/release/dev/logs</logfile_path>
<!--<providers-path>/data/java/service</providers-path>-->
<providers-path>/Users/chen/Develop/workspace/partner/data/release/dev</providers-path>
</properties>
</profile>
<profile>
......@@ -165,9 +158,7 @@
<mysql.server>jdbc:mysql://10.9.121.204:3306/huhu_finance</mysql.server>
<mysql.username>huhu_finance</mysql.username>
<mysql.password>huhu_finance</mysql.password>
<redis.host>10.9.186.167</redis.host>
<redis.password>passwdredis</redis.password>
<spring.profiles.active>dev</spring.profiles.active>
<spring.profiles.active>test</spring.profiles.active>
<logfile_path>/data/logs/java</logfile_path>
<!--<logfile_path>/Users/chen/Develop/workspace/partner/data/release/dev/logs</logfile_path>-->
<providers-path>/data/java/service</providers-path>
......@@ -186,11 +177,11 @@
<mysql.server>jdbc:mysql://10.9.63.72:3306/huhu</mysql.server>
<mysql.username>huhu</mysql.username>
<mysql.password>Huhu123~</mysql.password>
<redis.host>10.9.48.21</redis.host>
<redis.password>Ws_LrqD_20180319_REdis_MQLRd</redis.password>
<spring.profiles.active>prod</spring.profiles.active>
<logfile_path>/data/logs2/huhu/lanren</logfile_path>
<providers-path>/data/java/service</providers-path>
<!--<logfile_path>/data/logs2/huhu/lanren</logfile_path>-->
<!--<providers-path>/data/java/service</providers-path>-->
<logfile_path>/Users/chen/Develop/workspace/partner/data/release/prod/logs</logfile_path>
<providers-path>/Users/chen/Develop/workspace/partner/data/release/prod</providers-path>
</properties>
<!--跑线上结算时开启-->
<activation>
......
src/main/resources/mapper/AgentRewardMapper.xml
......@@ -786,24 +786,24 @@
SELECT
agent_id,
SUM(amount) balance,
SUM(case when recharge_time &lt; '2019-08-16 12:03:50' and agent_level=4 and reward_type in (50,740,60,760,300,750) then amount * 0.06 else 0 end) techCharge,
SUM(case when recharge_time &lt; '2019-08-16 12:03:50' and agent_level=4 and reward_type in (50,740,60,760,125,300,750) then amount * 0.06 else 0 end) techCharge,
SUM(case when recharge_time &lt; '2019-08-16 12:03:50' and agent_level=4 and reward_type in (50,740) then amount * 0.06 else 0 end) techChargeRedpack,
SUM(case when recharge_time &lt; '2019-08-16 12:03:50' and agent_level=4 and reward_type in (60,760,300,750) then amount * 0.06 else 0 end) techChargeOrder,
SUM(case when recharge_time &lt; '2019-08-16 12:03:50' and agent_level=4 and reward_type in (60,760,125,300,750) then amount * 0.06 else 0 end) techChargeOrder,
SUM(case when reward_type in (40) then amount else 0 end) opencardBalance,
SUM(case when reward_type in (50,740) then amount else 0 end) rechargeBalance,
SUM(case when reward_type in (30,710,720,210,80,230 ,780,290,790) then amount else 0 end) upgradeBalance,
SUM(case when reward_type in (30,710,720,210,80,230 ,780,290,800,810,790) then amount else 0 end) upgradeBalance,
SUM(case when reward_type in (20,730) then amount else 0 end) upgradeSuperBalance,
SUM(case when reward_type in (60,760) then amount else 0 end) shareBalance,
SUM(case when reward_type in (60,760,125) then amount else 0 end) shareBalance,
SUM(case when reward_type in (300,750) then amount else 0 end) zigoushengBalance,
SUM(0) pingtuiBalance,
SUM(if(reward_type IN (60, 750, 300, 760),amount, 0)) AS place_cash,
COUNT(reward_type IN (60, 750, 300, 760) OR NULL) AS place_num,
SUM(if(reward_type IN (60, 750, 300, 760,125),amount, 0)) AS place_cash,
COUNT(reward_type IN (60, 750, 300, 760,125) OR NULL) AS place_num,
SUM(if(reward_type IN (50, 740),amount, 0)) AS onlinerechargeCash,
COUNT(reward_type IN (50, 740) OR NULL) AS onlinerechargeNum,
SUM(if(reward_type=40, amount, 0)) AS open_card_cash,
COUNT(reward_type=40 OR NULL) AS open_card_num,
SUM(if(reward_type IN (30, 20, 710, 720, 730, 210, 80, 230 ,780,290,790),amount, 0)) AS upgrade_partner_cash,
COUNT(reward_type IN (30, 20, 710, 720, 730, 210, 80, 230 ,780,290,790) OR NULL) AS upgrade_partner_num,
SUM(if(reward_type IN (30, 20, 710, 720, 730, 210, 80, 230 ,780,290,800,810,790),amount, 0)) AS upgrade_partner_cash,
COUNT(reward_type IN (30, 20, 710, 720, 730, 210, 80, 230 ,780,290,800,810,790) OR NULL) AS upgrade_partner_num,
SUM(if(reward_type IN (50, 30, 20),cash_code, 0)) AS marketPerformance,
SUM(if(reward_type IN (30, 20),cash_code, 0)) AS upgrade_market_cash,
SUM(if(reward_type=50, cash_code, 0)) AS recharge_market_cash
......@@ -849,24 +849,24 @@
SELECT
agent_id,
SUM(amount) balance,
SUM(case when recharge_time &lt; '2019-08-16 12:03:50' and agent_level=4 and reward_type in (50,740,60,760,300,750) then amount * 0.06 else 0 end) techCharge,
SUM(case when recharge_time &lt; '2019-08-16 12:03:50' and agent_level=4 and reward_type in (50,740,60,760,125,300,750) then amount * 0.06 else 0 end) techCharge,
SUM(case when recharge_time &lt; '2019-08-16 12:03:50' and agent_level=4 and reward_type in (50,740) then amount * 0.06 else 0 end) techChargeRedpack,
SUM(case when recharge_time &lt; '2019-08-16 12:03:50' and agent_level=4 and reward_type in (60,760,300,750) then amount * 0.06 else 0 end) techChargeOrder,
SUM(case when recharge_time &lt; '2019-08-16 12:03:50' and agent_level=4 and reward_type in (60,760,125,300,750) then amount * 0.06 else 0 end) techChargeOrder,
SUM(case when reward_type in (40) then amount else 0 end) opencardBalance,
SUM(case when reward_type in (50,740) then amount else 0 end) rechargeBalance,
SUM(case when reward_type in (30,710,720,210, 80, 230 ,780,290,790) then amount else 0 end) upgradeBalance,
SUM(case when reward_type in (30,710,720,210, 80, 230 ,780,290,800,810,790) then amount else 0 end) upgradeBalance,
SUM(case when reward_type in (20,730) then amount else 0 end) upgradeSuperBalance,
SUM(case when reward_type in (60,760) then amount else 0 end) shareBalance,
SUM(case when reward_type in (60,760,125) then amount else 0 end) shareBalance,
SUM(case when reward_type in (300,750) then amount else 0 end) zigoushengBalance,
SUM(0) pingtuiBalance,
SUM(if(reward_type IN (60, 750, 300, 760),amount, 0)) AS place_cash,
COUNT(reward_type IN (60, 750, 300, 760) OR NULL) AS place_num,
SUM(if(reward_type IN (60, 750, 300, 760,125),amount, 0)) AS place_cash,
COUNT(reward_type IN (60, 750, 300, 760,125) OR NULL) AS place_num,
SUM(if(reward_type IN (50, 740),amount, 0)) AS onlinerechargeCash,
COUNT(reward_type IN (50, 740) OR NULL) AS onlinerechargeNum,
SUM(if(reward_type=40, amount, 0)) AS open_card_cash,
COUNT(reward_type=40 OR NULL) AS open_card_num,
SUM(if(reward_type IN (30, 20, 710, 720, 730, 210, 80, 230 ,780,290,790),amount, 0)) AS upgrade_partner_cash,
COUNT(reward_type IN (30, 20, 710, 720, 730, 210, 80, 230 ,780,290,790) OR NULL) AS upgrade_partner_num,
SUM(if(reward_type IN (30, 20, 710, 720, 730, 210, 80, 230 ,780,290,800,810,790),amount, 0)) AS upgrade_partner_cash,
COUNT(reward_type IN (30, 20, 710, 720, 730, 210, 80, 230 ,780,290,800,810,790) OR NULL) AS upgrade_partner_num,
SUM(if(reward_type IN (50, 30, 20),cash_code, 0)) AS marketPerformance,
SUM(if(reward_type IN (30, 20),cash_code, 0)) AS upgrade_market_cash,
SUM(if(reward_type=50, cash_code, 0)) AS recharge_market_cash
......
src/main/resources/mapper/PartnerRewardMapper.xml
......@@ -853,19 +853,19 @@
<select id="selectPartnerSettlePageByTs" resultType="com.lanren.huhu.partner.model.PartnerSettle">
SELECT
user_id,
SUM(CASE WHEN reward_type IN (110,120) THEN commission_acount ELSE 0 END) -
SUM(CASE WHEN reward_type IN (110, 120) AND recharge_time &lt; '2019-08-16 12:03:50' THEN commission_acount * CASE WHEN user_is_super=1 THEN 0.03 WHEN user_partner_level=20 THEN 0.06 ELSE 0 END
WHEN reward_type IN (110, 120) AND tech_fee_rate &gt; 0 THEN all_money_ori * tech_fee_rate
SUM(CASE WHEN reward_type IN (110,120,125) THEN commission_acount ELSE 0 END) -
SUM(CASE WHEN reward_type IN (110, 120,125) AND recharge_time &lt; '2019-08-16 12:03:50' THEN commission_acount * CASE WHEN user_is_super=1 THEN 0.03 WHEN user_partner_level=20 THEN 0.06 ELSE 0 END
WHEN reward_type IN (110, 120,125) AND tech_fee_rate &gt; 0 THEN all_money_ori * tech_fee_rate
ELSE 0
END) sum_order_commission,
SUM(CASE WHEN reward_type=60 THEN commission_acount ELSE 0 END) -
SUM(CASE WHEN recharge_time &lt; '2019-08-16 12:03:50' AND reward_type IN (60) THEN commission_acount * CASE WHEN user_is_super=1 THEN 0.03 WHEN user_partner_level=20 THEN 0.06 ELSE 0 END
ELSE 0 END) sum_redpack,
SUM(CASE WHEN reward_type NOT IN (60,110,120) THEN commission_acount ELSE 0 END) sum_others,
SUM(CASE WHEN reward_type NOT IN (60,110,120,125) THEN commission_acount ELSE 0 END) sum_others,
SUM(CASE WHEN recharge_time &lt; '2019-08-16 12:03:50' AND reward_type IN (60) THEN commission_acount * CASE WHEN user_is_super=1 THEN 0.03 WHEN user_partner_level=20 THEN 0.06 ELSE 0 END
ELSE 0 END) tech_charge_redpack,
SUM(CASE WHEN reward_type IN (110, 120) AND recharge_time &lt; '2019-08-16 12:03:50' THEN commission_acount * CASE WHEN user_is_super=1 THEN 0.03 WHEN user_partner_level=20 THEN 0.06 ELSE 0 END
WHEN reward_type IN (110, 120) AND tech_fee_rate &gt; 0 THEN all_money_ori * tech_fee_rate
SUM(CASE WHEN reward_type IN (110, 120,125) AND recharge_time &lt; '2019-08-16 12:03:50' THEN commission_acount * CASE WHEN user_is_super=1 THEN 0.03 WHEN user_partner_level=20 THEN 0.06 ELSE 0 END
WHEN reward_type IN (110, 120,125) AND tech_fee_rate &gt; 0 THEN all_money_ori * tech_fee_rate
ELSE 0
END) tech_charge_order,
0 wx_income,
......@@ -874,14 +874,14 @@
0 bank_tax,
SUM(if(reward_type=60 AND is_show_on_client=1, commission_acount, 0)) AS cash,
COUNT(reward_type=60 OR NULL) AS num,
SUM(if(reward_type IN (70,210,220,320,330,230, 100) AND is_show_on_client=1,commission_acount, 0)) AS upCash,
COUNT(reward_type IN (70,210,220,320,330,230, 100)OR NULL) AS upNum,
SUM(if(reward_type IN (70,210,220,320,330,230,290,500,100) AND is_show_on_client=1,commission_acount, 0)) AS upCash,
COUNT(reward_type IN (70,210,220,320,330,230,290,500,100)OR NULL) AS upNum,
SUM(if(reward_type=80 AND is_show_on_client=1, commission_acount, 0)) AS icash,
COUNT(reward_type=80 OR NULL) AS inum,
SUM(if(reward_type=90 AND is_show_on_client=1, commission_acount, 0)) AS pcash,
COUNT(reward_type=90 OR NULL) AS pnum,
SUM(if(reward_type IN(110, 120) AND is_show_on_client=1,commission_acount, 0)) AS scash,
COUNT(reward_type IN(110, 120) OR NULL) AS snum,
SUM(if(reward_type IN(110, 120,125) AND is_show_on_client=1,commission_acount, 0)) AS scash,
COUNT(reward_type IN(110, 120,125) OR NULL) AS snum,
SUM(if(is_show_on_client=0, commission_acount, 0)) AS rcash
FROM partner_reward
WHERE settle_time
......@@ -895,19 +895,19 @@
<select id="selectPartnerSettleByTsAndUid" resultType="com.lanren.huhu.partner.model.PartnerSettle">
SELECT
user_id,
SUM(CASE WHEN reward_type IN (110,120) THEN commission_acount ELSE 0 END) -
SUM(CASE WHEN reward_type IN (110, 120) AND recharge_time &lt; '2019-08-16 12:03:50' THEN commission_acount * CASE WHEN user_is_super=1 THEN 0.03 WHEN user_partner_level=20 THEN 0.06 ELSE 0 END
WHEN reward_type IN (110, 120) AND tech_fee_rate &gt; 0 THEN all_money_ori * tech_fee_rate
SUM(CASE WHEN reward_type IN (110,120,125) THEN commission_acount ELSE 0 END) -
SUM(CASE WHEN reward_type IN (110, 120,125) AND recharge_time &lt; '2019-08-16 12:03:50' THEN commission_acount * CASE WHEN user_is_super=1 THEN 0.03 WHEN user_partner_level=20 THEN 0.06 ELSE 0 END
WHEN reward_type IN (110, 120,125) AND tech_fee_rate &gt; 0 THEN all_money_ori * tech_fee_rate
ELSE 0
END) sum_order_commission,
SUM(CASE WHEN reward_type=60 THEN commission_acount ELSE 0 END) -
SUM(CASE WHEN recharge_time &lt; '2019-08-16 12:03:50' AND reward_type IN (60) THEN commission_acount * CASE WHEN user_is_super=1 THEN 0.03 WHEN user_partner_level=20 THEN 0.06 ELSE 0 END
ELSE 0 END) sum_redpack,
SUM(CASE WHEN reward_type NOT IN (60,110,120) THEN commission_acount ELSE 0 END) sum_others,
SUM(CASE WHEN reward_type NOT IN (60,110,120,125) THEN commission_acount ELSE 0 END) sum_others,
SUM(CASE WHEN recharge_time &lt; '2019-08-16 12:03:50' AND reward_type IN (60) THEN commission_acount * CASE WHEN user_is_super=1 THEN 0.03 WHEN user_partner_level=20 THEN 0.06 ELSE 0 END
ELSE 0 END) tech_charge_redpack,
SUM(CASE WHEN reward_type IN (110, 120) AND recharge_time &lt; '2019-08-16 12:03:50' THEN commission_acount * CASE WHEN user_is_super=1 THEN 0.03 WHEN user_partner_level=20 THEN 0.06 ELSE 0 END
WHEN reward_type IN (110, 120) AND tech_fee_rate &gt; 0 THEN all_money_ori * tech_fee_rate
SUM(CASE WHEN reward_type IN (110, 120,125) AND recharge_time &lt; '2019-08-16 12:03:50' THEN commission_acount * CASE WHEN user_is_super=1 THEN 0.03 WHEN user_partner_level=20 THEN 0.06 ELSE 0 END
WHEN reward_type IN (110, 120,125) AND tech_fee_rate &gt; 0 THEN all_money_ori * tech_fee_rate
ELSE 0
END) tech_charge_order,
0 wx_income,
......@@ -916,14 +916,14 @@
0 bank_tax,
SUM(if(reward_type=60 AND is_show_on_client=1, commission_acount, 0)) AS cash,
COUNT(reward_type=60 OR NULL) AS num,
SUM(if(reward_type IN (70,210,220,320,330,230, 100) AND is_show_on_client=1,commission_acount, 0)) AS upCash,
COUNT(reward_type IN (70,210,220,320,330,230, 100)OR NULL) AS upNum,
SUM(if(reward_type IN (70,210,220,320,330,230,290,500, 100) AND is_show_on_client=1,commission_acount, 0)) AS upCash,
COUNT(reward_type IN (70,210,220,320,330,230,290,500, 100)OR NULL) AS upNum,
SUM(if(reward_type=80 AND is_show_on_client=1, commission_acount, 0)) AS icash,
COUNT(reward_type=80 OR NULL) AS inum,
SUM(if(reward_type=90 AND is_show_on_client=1, commission_acount, 0)) AS pcash,
COUNT(reward_type=90 OR NULL) AS pnum,
SUM(if(reward_type IN(110, 120) AND is_show_on_client=1,commission_acount, 0)) AS scash,
COUNT(reward_type IN(110, 120) OR NULL) AS snum,
SUM(if(reward_type IN(110, 120,125) AND is_show_on_client=1,commission_acount, 0)) AS scash,
COUNT(reward_type IN(110, 120,125) OR NULL) AS snum,
SUM(if(is_show_on_client=0, commission_acount, 0)) AS rcash
FROM partner_reward
WHERE settle_time
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment