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

12月功能提交

Application/Admin/Controller/OldCountController.class.php

@@ -10,6 +10,62 @@ namespace Admin\Controller;
 class OldCountController extends \Think\Controller
 {
 
+    public function updateStatementInfo() {
+
+        $data = M("company_statement_info","tab_")
+            ->where(['pay_status'=>['neq',0]])
+            ->select();
+
+        foreach ($data as $key => $value) {
+
+            M("company_statement_info","tab_")
+                ->where(['id'=>$value['id']])
+                ->save([
+                        'pay_verify_status'=>1,
+                        'verify_time'=>$value['pay_time'],
+                        'verify_member_id'=>1
+                    ]);
+        }
+
+        $data = M("excel_statement_info","tab_")
+            ->where("1=1")
+            ->select();
+
+        foreach ($data as $key => $value) {
+            $statement_info = json_decode($value['statement_info'],true);
+            $time = explode('-',$statement_info[0]['game_list'][0]['statement_time']);
+            $start = strtotime(str_replace('.','-',$time[0]));
+            $end = strtotime(str_replace('.','-',$time[1]));
+
+            M("excel_statement_info","tab_")
+                ->where(['id'=>$value['id']])
+                ->save([
+                    'statement_begin_time'=>$start,
+                    'statement_end_time'=>$end
+                ]);
+
+//            dump($statement_info);
+        }
+
+        $data = M("excel_statement_info","tab_")
+            ->where(['pay_status'=>['neq',0]])
+            ->select();
+
+        foreach ($data as $key => $value) {
+
+            M("excel_statement_info","tab_")
+                ->where(['id'=>$value['id']])
+                ->save([
+                    'verify_status'=>1,
+                    'verify_time'=>$value['pay_time'],
+                    'verify_member_id'=>1
+                ]);
+        }
+
+        echo "success";
+
+    }
+
     public function oldRewardChange() {
 
         $data = M("company_lack_statement_info","tab_")

Application/Payment/View/Payment/viewPuPool.html

@@ -229,7 +229,7 @@
 <!--                                <td rowspan="{$com.row}"></td>-->
                             </if>
 
-                            <td rowspan="{$com.row}">{$com.remark}</td>-->
+                            <td rowspan="{$com.row}">{$com.remark}</td>
 
                         </tr>