From 518c902b2a1a6aa75e7b02f45e5a1a1959c6e608 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Fri, 18 Sep 2020 19:47:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=B1=87=E6=80=BB=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...regateFinanceStatementController.class.php |  3 +--
 .../View/AggregateFinanceStatement/lists.html |  6 +++---
 Data/update.sql                               | 21 ++++++++++++++++++-
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php
index 21acb9bae..33ab1304b 100644
--- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php
+++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php
@@ -808,7 +808,7 @@ class AggregateFinanceStatementController extends ThinkController
         }
 
         foreach ($dbres as $k=>$v) {
-            if($v['verify_status'] != 3) continue;
+            if($v['verify_status'] == 0 || $v['verify_status'] == -1 ||$v['verify_status'] == 6) continue;
 
             $this->setDf($datas['aggregate'],$v);
         }
@@ -1047,7 +1047,6 @@ class AggregateFinanceStatementController extends ThinkController
     protected function updatePoolVerifyStatus($ids,$old_status,$change_status,$op_pre,$num){
         $dbres = M("aggregate_statement","tab_")->field("id,verify_status")->where("id in ({$ids})")->select();
         foreach($dbres as $k=>&$v){
-            if($v['verify_status'] != $old_status) continue;
 
             $v['verify_status']=$change_status;
             $v['op_time']=time();
diff --git a/Application/Admin/View/AggregateFinanceStatement/lists.html b/Application/Admin/View/AggregateFinanceStatement/lists.html
index 3b248f9dd..e5ae3599a 100644
--- a/Application/Admin/View/AggregateFinanceStatement/lists.html
+++ b/Application/Admin/View/AggregateFinanceStatement/lists.html
@@ -234,18 +234,18 @@
             $("#pool").on("click",function(){
                 var flag = false;
                 var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
-                    if($(elem).data("status") == -1||$(elem).data("status") == 0){
+                    if($(elem).data("status") == -1||$(elem).data("status") == 0 || $(elem).data("status") == 6){
                         flag = true;
                     }else{
                         return $(elem).val();
                     }
                 }).get().join(",");
                 if(text == ''){
-                    layer.msg("<font style='color:white'>" + '无需要审批通过的结算单,[审核拒绝,系统生成结算单]状态不可以进行审批通过' + "</font>");
+                    layer.msg("<font style='color:white'>" + '无需要汇总的结算单,[审核拒绝,系统生成结算单,已汇总]状态不可以进行审批通过' + "</font>");
                     return;
                 }
                 if(flag){
-                    layer.confirm("发起汇总不会对 [审核拒绝,系统生成结算单] 结算单处理，选择中包含其他的状态的结算单将被忽略，点击取消停止操作",{title:false}, function(index){
+                    layer.confirm("发起汇总不会对 [审核拒绝,系统生成结算单,已汇总] 结算单处理，选择中包含其他的状态的结算单将被忽略，点击取消停止操作",{title:false}, function(index){
                         _doPoolApply();
                         layer.close(index);
                     });  
diff --git a/Data/update.sql b/Data/update.sql
index fcb32c293..be4dca2a7 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -2499,4 +2499,23 @@ ADD COLUMN `work_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '离职状态' AF
 
 ALTER TABLE `tab_company_relation_log`
 ADD COLUMN `first_company_info` longtext NULL COMMENT '甲方公司信息' AFTER `first_company_type`,
-ADD COLUMN `second_company_info` longtext NULL COMMENT '乙方公司信息' AFTER `second_company_type`;
\ No newline at end of file
+ADD COLUMN `second_company_info` longtext NULL COMMENT '乙方公司信息' AFTER `second_company_type`;
+
+CREATE TABLE `tab_payment_orders` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `merchant_id` int(11) NOT NULL COMMENT '商户ID',
+  `order_no` varchar(100) NOT NULL COMMENT '订单号',
+  `business_type` varchar(20) NOT NULL DEFAULT '' COMMENT '业务类型',
+  `order_amount` decimal(12, 2) not null default '0.00' comment '订单金额',
+  `fee` decimal(12, 2) not null default '0.00' comment '手续费',
+  `product_name` varchar(255)  NOT NULL DEFAULT '' COMMENT '产品名称',
+  `channel_order_no` varchar(100) NOT NULL DEFAULT '' COMMENT '渠道订单号',
+  `channel_user_account` varchar(100) NOT NULL DEFAULT '' COMMENT '渠道用户',
+  `remark` varchar(255) NOT NULL DEFAULT '' COMMENT '备注',
+  `created_at` datetime NOT NULL  COMMENT '订单创建时间',
+  `finished_at` datetime NOT NULL COMMENT '订单完成时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+
+