12份功能提交

Application/Payment/Controller/PaymentController.class.php

@@ -175,8 +175,12 @@ class PaymentController extends BaseController
                     $value['pay_time'] = date('Y-m-d H:i:s',$value['pay_time']);
                 }
                 $value["valid"] = "{$value['statement_begin_time']} ~ {$value['statement_end_time']}";
+
                 $handleData[$value['statement_info_id']]['data'][] = $value;
-                $handleData[$value['statement_info_id']]['ids'][] = $value['id'];
+
+                if ($value['pay_status'] != 1) {
+                    $handleData[$value['statement_info_id']]['ids'][] = $value['id'];
+                }
             }
 
             foreach ($CompanyInfo as $key=>$value) {
@@ -918,7 +922,9 @@ class PaymentController extends BaseController
         M("pay_statement_info","tab_")->save($savedata);
 
         if ($savedata["pay_status"] == -1) {
-            $this->ajaxReturn(["success"=>"打款成功","data"=>["status"=>0]]);
+            //支付详单bug修改
+            $this->setPayVerifyStatus(-1,$savedata["pay_type"],$id);
+            $this->ajaxReturn(["success"=>"打款成功","data"=>["status"=>0],'amount'=>$dbres['statement_money']]);
         }
 
         //支付详单bug修改
@@ -933,7 +939,7 @@ class PaymentController extends BaseController
 
         $pay_info = M("pay_statement_info","tab_")->where(['id'=>$id])->find();
 
-        $info = M("pay_statement_info","tab_")->where("statement_info_id = {$pay_info['statement_info_id']} AND pay_status <> 1")->find();
+        $info = M("pay_statement_info","tab_")->where("statement_info_id = {$pay_info['statement_info_id']} AND pay_status <> 1")->select();
 
         $dbres['pay_status'] = $change_status;
         $dbres['pay_type'] = $pay_type;
@@ -941,6 +947,22 @@ class PaymentController extends BaseController
         if (empty($info)) {
             M("company_statement_info","tab_")->where(['id'=>$pay_info['statement_info_id']])->save($dbres);
         }
+        else {
+
+            if ($change_status == -1) {
+
+                foreach ($info as $key => $value) {
+
+                    if ($value['pay_status'] == -1) {
+                        M("company_statement_info","tab_")->where(['id'=>$pay_info['statement_info_id']])->save($dbres);
+                        return;
+                    }
+
+                }
+
+            }
+
+        }
 
     }
 

Application/Payment/View/Payment/lists.html

@@ -291,7 +291,7 @@
                                   <td>{$s_data.statement_money}</td>
                                   <td>{$data.verify|default='--'}</td>
                                   <!--                                <td>{$data.platform_amount}</td>-->
-                                  <if condition="($data['verify_status'] eq -1) OR ($data['pay_status'] eq -1) ">
+                                  <if condition="($s_data['verify_status'] eq -1) OR ($s_data['pay_status'] eq -1) ">
                                     <td style="color: red;">{$s_data.verify_status_str}</td>
                                     <else />
                                     <td>{$s_data.verify_status_str}</td>