结算bug修复

src/main/resources/application.yml

@@ -78,7 +78,7 @@ mybatis-plus:
 logging:
   level:
     #打印SQL信息
-    com.lanren.huhu.partner.dao: debug
+    com.lanren.huhu.partner.dao: info
 
 
 

src/main/resources/mapper/PartnerRewardMapper.xml

@@ -865,7 +865,7 @@
       SUM(CASE WHEN recharge_time < '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,125) AND recharge_time < '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 > 0 THEN all_money_ori * tech_fee_rate
+               WHEN reward_type IN (110, 120,125) AND tech_fee_rate > 0 AND settle_state > 0 THEN all_money_ori * tech_fee_rate
                ELSE 0
           END) tech_charge_order,
       0 wx_income,
@@ -907,7 +907,7 @@
       SUM(CASE WHEN recharge_time < '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,125) AND recharge_time < '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 > 0 THEN all_money_ori * tech_fee_rate
+               WHEN reward_type IN (110, 120,125) AND tech_fee_rate > 0 AND settle_state > 0 THEN all_money_ori * tech_fee_rate
                ELSE 0
           END) tech_charge_order,
       0 wx_income,