Merge pull request '12月功能提交' (#5) from feature/add_item into release

12月功能提交

Application/Admin/Controller/CompanyStatementPoolController.class.php

@@ -1896,7 +1896,7 @@ class CompanyStatementPoolController extends ThinkController
 
                                 $game_list = $shv['game_list'];
                                 foreach ($game_list as $gk => $gv) {
-                                    $statement_money += $gv['sum_money']+$gv['reward']+$gv['reward']-$gv['fine'];
+                                    $statement_money += $gv['sum_money']+$gv['reward']-$gv['fine']-$gv['withhold'];
                                 }
                             }
 

Application/Payment/Controller/ExcelPaymentController.class.php

@@ -309,7 +309,7 @@ class ExcelPaymentController extends BaseController
         }
         if($is_export){
             $count["platform_amount"] = "=SUM(J2:J".$line.")";
-            $count["sum_money"] = "=SUM(O2:O".$line.")";
+            $count["sum_money"] = "=SUM(D2:D".$line.")";
         }
         $this->assign("data",$infolist);
         $this->assign("count",$count);

Application/Payment/Controller/PaymentController.class.php

@@ -1055,7 +1055,7 @@ class PaymentController extends BaseController
             ->select();
 
         foreach ($companyStatementInfo as $key => $value) {
-            if ($value['statement_money'] < 0) {
+            if ($value['statement_money'] <= 0) {
                 $payres["remark"] = '打款金额非正,直接打款成功';
 
                 $pay_info = json_encode($payres, JSON_UNESCAPED_UNICODE);
@@ -1069,6 +1069,16 @@ class PaymentController extends BaseController
                         'statement_info_id'=>['in',$value['id']]
                     ])
                     ->save(['pay_status'=>1,'pay_time'=>time(),'pay_type'=>2,'pay_info'=>$pay_info]);
+            } else {
+                $payres["remark"] = '打款金额非正,直接打款成功';
+
+                $pay_info = json_encode($payres, JSON_UNESCAPED_UNICODE);
+                M("pay_statement_info","tab_")
+                    ->where([
+                        'statement_info_id'=>['in',$value['id']],
+                        'statement_money'=>['elt',0]
+                    ])
+                    ->save(['pay_status'=>1,'pay_time'=>time(),'pay_type'=>2,'pay_info'=>$pay_info]);
             }
         }