ad

app/admin/controller/Filing.php

@@ -397,12 +397,17 @@ class Filing extends Base
             ->findOrEmpty();
         if (empty($rs)) return json_show(1005, '该报备单不存在或不允许审核');
 
-		$companyName='';
+		 $update = array_merge($param, [
+            'status'=>$param['is_check'],
+            'updaterid' => $this->uid,
+            'updater' => $this->uname,
+            'updatetime' => date('Y-m-d H:i:s'),
+        ]);
         if($param["is_check"]==2){
 	        $userCommon = \app\admin\common\User::getIns();
 	        $company = $userCommon->handle('cInfo', ['companyNo' => $param['companyCode']]);
 	        if (!isset($company['data'])) return json_show(1005, '该客户不存在');
-	        $companyName=$company['data']['companyName']??"";
+	        $update['companyName']=$company['data']['companyName']??"";
 	                   $tmp = Db::name('platform')
 	            ->where(['is_del' => 0, 'id' => $param['platform_id']])
 	            ->field('id,is_select_pay_rate,status')
@@ -416,14 +421,14 @@ class Filing extends Base
 
 
         //校验支付渠道中的业务公司是否与报备单业务公司重复
-
-        $update = array_merge($param, [
-            'companyName' =>  $companyName,
-            "status"=>$param["is_check"],
-            'updaterid' => $this->uid,
-            'updater' => $this->uname,
-            'updatetime' => date('Y-m-d H:i:s'),
-        ]);
+//
+//        $update = array_merge($param, [
+//            'companyName' =>  $companyName,
+//            "status"=>$param["is_check"],
+//            'updaterid' => $this->uid,
+//            'updater' => $this->uname,
+//            'updatetime' => date('Y-m-d H:i:s'),
+//        ]);
 //
 //        if ($rs['is_determine_price'] == 1) $update['cgd_charge'] = round(bcsub($rs['price'], $param['service_charge'], 3), 2);//确定售价时，采购价=售价-服务费
 //        else $update['price'] = round(bcadd($rs['cgd_charge'], $param['service_charge'], 3), 2);//不确定售价时，售价=采购价+服务费

app/admin/controller/Sale.php

@@ -5183,14 +5183,18 @@ class Sale extends Base
                 if($sale['order_type'] == 4){
                     $fill =Db::name("filing")->where(["filingCode"=>$sale["platform_order"]])->findOrEmpty();
                     if(empty($fill)) throw new Exception($sale['orderCode'] . '未找到对应得报备单');
+                    $fullData=[
+                    	'transfer_num'=>$fill['transfer_num']-$sale['wsend_num'],
+                    	'wait_num'=>$fill['wait_num']+$sale['wsend_num'],
+                         'status'=>$fill['wait_num']+$sale['wsend_num']==0?4:
+                         ($fill['transfer_num']-$sale['wsend_num']==0?2:3)];
+         
                     $fillup=Db::name('filing')
                     ->where($fill)
-                    ->data([
-                    	"transfer_num"=>$fill["transfer_num"]-$sale['wsend_num'],
-                    	"wait_num"=>$fill["wait_num"]+$sale['wsend_num'],
-                         "status"=>$fill['wait_num']+$sale['wsend_num']==0?4:($fill['transfer_num']-$sale['wsend_num']==0?2:3)
-                    ])
+                    ->data($fullData)
                     ->update();
+                  $stn = ['order_code' => $fill['filingCode'], 'status' =>$fullData['status'], 'action_remark' => '', 'action_type' => 'status'];
+                 ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname], $stn, 'BBD', $fill['status'],$fullData);
                     if($fillup==false)throw new Exception($sale['platform_order'] . '报备单更新失败');
                 }
 				 $fininfo =GetFin("admin/orderischeck",["token"=>$this->post['token'],"orderCode"=>$sale['orderCode'], "isCgd"=>1]);