Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115

Application/Admin/Controller/FinancePromoteController.class.php

@@ -294,7 +294,7 @@ class FinancePromoteController extends AdminController
             }
             $map['s.pay_status']=1;
             $map['s.is_check']=2;
-            $field= "SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count,
+            $field= "SUM(CASE WHEN pay_way >= 0 THEN pay_amount ELSE 0 END) as cash_count,
                     SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count,
                     SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as bind_coin_count,
                     IFNULL(if(substring_index(substring_index(promote.`chain`,'/',2),'/',-1)='',s.promote_id,substring_index(substring_index(promote.`chain`,'/',2),'/',-1)),0) p_id,