客户管理-日志增加

app/Console/Commands/CreateOwnerAreaReport.php

@@ -3,6 +3,7 @@
 namespace App\Console\Commands;
 
 use App\OwnerAreaReport;
+use App\Services\LogService;
 use App\Services\OwnerService;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
@@ -60,6 +61,7 @@ class CreateOwnerAreaReport extends Command
                 }
             }
             DB::table("owner_area_reports")->insert($createOwnerAreaReport);
+            LogService::log(__METHOD__,"客户管理-定时生成盘点记录",json_encode($createOwnerAreaReport));
         }
     }
 }

app/Console/Commands/CreateOwnerBillReport.php

@@ -3,6 +3,7 @@
 namespace App\Console\Commands;
 
 use App\OwnerAreaReport;
+use App\Services\LogService;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 
@@ -76,6 +77,7 @@ class CreateOwnerBillReport extends Command
                     "created_at"        => $date,
                 ];
             }
+            LogService::log(__METHOD__,"客户管理-生成确认账单",json_encode($createOwnerBillReport));
             DB::table("owner_bill_reports")->insert($createOwnerBillReport);
         }
     }

app/Console/Commands/CreateOwnerReport.php

@@ -117,8 +117,9 @@ class CreateOwnerReport extends Command
             ];
         }
         //执行生成或修改
-        app('LogService')->log(__METHOD__,"生成货主报表",json_encode($createReports));
         app(BatchUpdateService::class)->batchUpdate('owner_reports', $updateReports);
+        app('LogService')->log(__METHOD__,"客户管理-修改原有货主报表",json_encode($updateReports));
         DB::table("owner_reports")->insert($createReports);
+        app('LogService')->log(__METHOD__,"客户管理-生成货主报表",json_encode($createReports));
     }
 }

app/Http/Controllers/CustomerBaseController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Services\LogService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Gate;
@@ -47,6 +48,7 @@ class CustomerBaseController extends Controller
             "name"=>$request->input("name"),
             "company_name"=>$request->input("company_name"),
         ]);
+        LogService::log(__METHOD__,"录入客户",json_encode($request->input(),JSON_UNESCAPED_UNICODE));
         return response()->redirectTo("maintenance/customer")->with("successTip","成功创建客户“".$request->input("name")."”");
     }
 
@@ -80,6 +82,7 @@ class CustomerBaseController extends Controller
             "company_name"=>$request->input("company_name"),
         ]);
         if ($result == 1){
+            LogService::log(__METHOD__,"修改客户",json_encode($request->input(),JSON_UNESCAPED_UNICODE));
             return response()->redirectTo("maintenance/customer")->with("successTip","成功修改客户“".$request->input("name")."”的信息");
         }
         return response()->view("exception.default",["code"=>"509"]);
@@ -95,7 +98,10 @@ class CustomerBaseController extends Controller
     {
         if(!Gate::allows('客户-删除')){ return ["success"=>false,"data"=>"无权操作！"];  }
         $result = app('CustomerService')->destroy($id);
-        if ($result == 1)return ["success"=>true];
+        if ($result == 1){
+            LogService::log(__METHOD__,"删除客户",$id);
+            return ["success"=>true];
+        }
         return ["success"=>false,"data"=>"删除了“".$result."”行"];
     }
 

app/Http/Controllers/CustomerController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Owner;
+use App\Services\LogService;
 use App\Services\OwnerAreaReportService;
 use App\Services\OwnerBillReportService;
 use App\Services\OwnerReportService;
@@ -184,6 +185,7 @@ class CustomerController extends Controller
                 "ownerStoragePriceModels" => explode(',',$params["owner_storage_price_model_id"])
             ]);
             $msg = "成功更新“".$owner->name."”的信息！";
+            LogService::log(__METHOD__,"客户管理-修改货主",json_encode($params,JSON_UNESCAPED_UNICODE));
         }else{
             $owner = app('OwnerService')->create([
                 "name"                  => $params["name"],
@@ -201,6 +203,7 @@ class CustomerController extends Controller
                 "ownerStoragePriceModels" => explode(',',$params["owner_storage_price_model_id"])
             ]);
             $msg = "成功创建“".$owner->name."”项目！";
+            LogService::log(__METHOD__,"客户管理-增加货主",json_encode($params,JSON_UNESCAPED_UNICODE));
         }
         return response()->redirectTo('customer/project/index')->with('successTip',$msg);
     }
@@ -251,9 +254,12 @@ class CustomerController extends Controller
         }
         $accounting_area = ((int)$values["area_on_tray"]*205) + ((int)$values["area_on_half_tray"]*1.8) + ((int)$values["area_on_flat"]*1.3);
         $values["accounting_area"] = $accounting_area;
-        if (app('OwnerAreaReportService')->update(["id"=>$request->id],$values))
+        $row = app('OwnerAreaReportService')->update(["id"=>$request->id],$values);
+        if ($row==1){
+            LogService::log(__METHOD__,"客户管理-修改面积",json_encode($request->input()));
             return ["success"=>true,"data"=>$values];
-        return ["success"=>false,"data"=>"未知错误！"];
+        }
+        return ["success"=>false,"data"=>"影响了".$row."条数据！"];
     }
 
     public function projectAreaExport(Request $request)
@@ -389,6 +395,7 @@ class CustomerController extends Controller
         if (!$request->confirm_fee || !is_numeric($request->confirm_fee) || $request->confirm_fee<0)return ["success"=>false,"data"=>"非法金额参数"];
         $date = date('Y-m-d H:i:s');
         app('OwnerBillReportService')->update(["id"=>$request->id],["confirm_fee"=>$request->confirm_fee,"difference"=>DB::raw($request->confirm_fee.'- initial_fee'),"updated_at"=>$date]);
+        LogService::log(__METHOD__,"客户管理-修改账单报表",json_encode($request->input()));
         return ["success"=>true,"data"=>$date];
     }
 
@@ -397,6 +404,10 @@ class CustomerController extends Controller
         if(!Gate::allows('客户管理-财务-账单确认-完结')){ return ["success"=>false,'data'=>"无权操作！"];  }
         if (!($request->id ?? false))return["success"=>false,"data"=>"非法参数"];
         app('OwnerBillReportService')->update(["id"=>$request->id],["confirmed"=>"是"]);
+        LogService::log(__METHOD__,"客户管理-确认账单",json_encode($request->input()));
+        $bill =  app('OwnerBillReportService')->first(["id"=>$request->id,"confirmed"=>"是"]);
+        app('OwnerAreaReportService')->lockArea(null, $bill->owner_id, $bill->counting_month);
+        LogService::log(__METHOD__,"客户管理-锁定账单的所有面积",json_encode($bill,JSON_UNESCAPED_UNICODE));
         return ["success"=>true];
     }
 

app/Http/Controllers/PriceModelController.php

@@ -13,6 +13,7 @@ use App\OwnerPriceExpressProvince;
 use App\OwnerPriceLogistic;
 use App\OwnerPriceOperation;
 use App\Services\common\ExportService;
+use App\Services\LogService;
 use App\Services\OwnerOutStorageRuleService;
 use App\Services\OwnerPriceOperationService;
 use Illuminate\Database\Eloquent\Builder;
@@ -43,6 +44,7 @@ class PriceModelController extends Controller
         if(!Gate::allows('计费模型-仓储-录入')){ return redirect('denied');  }
         $this->storageValidator($request->input())->validate();
         app('OwnerStoragePriceModelService')->create($request->input());
+        LogService::log(__METHOD__,"计费模型-创建仓储计费",json_encode($request->input(),JSON_UNESCAPED_UNICODE));
         return response()->redirectTo('maintenance/priceModel/storage')->with('successTip',"创建成功！");
     }
 
@@ -66,12 +68,14 @@ class PriceModelController extends Controller
             "discount_value"=> $request->input("discount_value"),
             "unit_id"       => $request->input("unit_id"),
         ]);
+        LogService::log(__METHOD__,"计费模型-修改仓储计费",json_encode($request->input(),JSON_UNESCAPED_UNICODE));
         return response()->redirectTo('maintenance/priceModel/storage')->with('successTip',"更新成功！");
     }
 
     public function storageDestroy($id)
     {
         app("OwnerStoragePriceModelService")->destroy($id);
+        LogService::log(__METHOD__,"计费模型-删除仓储计费",$id);
         return ["success"=>true];
     }
 
@@ -129,7 +133,10 @@ class PriceModelController extends Controller
             "unit_id"=>$request->input("unit_id"),
             "priority"=>$request->input("priority"),
             "unit_price"=>$request->input("unit_price")]);
-        if ($row == 1) return ["success"=>true];
+        if ($row == 1){
+            LogService::log(__METHOD__,"计费模型-修改出库规则",json_encode($request->input()));
+            return ["success"=>true];
+        }
         return ["success"=>false,"data"=>"受影响数据数为：".$row];
     }
 
@@ -149,6 +156,7 @@ class PriceModelController extends Controller
                 break;
         }
         $data = $service->create($request->input());
+        LogService::log(__METHOD__,"计费模型-录入出库规则",json_encode($request->input()));
         $data->load("unit");
         return ["success"=>true,"data"=>$data];
     }
@@ -177,6 +185,7 @@ class PriceModelController extends Controller
         if (count($stack) > 0)return ["success"=>false,"data"=>"组标记错误，起始与结束标记必须对应"];
         $row = app('OwnerOutStorageRuleService')->update(["id"=>$id],["feature"=>$feature]);
         if ($row != 1)return ["success"=>false,"data"=>"影响了“".$row."”行"];
+        LogService::log(__METHOD__,"计费模型-修改出库特征",json_encode($request->input()));
         OwnerOutStorageRule::$features = $result["map"];
         $rule = app('OwnerOutStorageRuleService')->find($id)->append("featureFormat");
         return ["success"=>true,"data"=>["featureFormat"=>$rule->featureFormat,"feature"=>$feature]];
@@ -205,7 +214,10 @@ class PriceModelController extends Controller
     {
         if(!Gate::allows('计费模型-作业-删除')){ return ["success"=>false,"data"=>"无权操作"];  }
         $row = app("OwnerPriceOperationService")->destroy($id);
-        if ($row == 1)return ["success"=>true];
+        if ($row == 1){
+            LogService::log(__METHOD__,"计费模型-删除作业计费",$id);
+            return ["success"=>true];
+        }
         return ["success"=>false,"data"=>"影响了“".$row."”行"];
     }
 
@@ -259,6 +271,7 @@ class PriceModelController extends Controller
         //录入中间表
         /** @var OwnerPriceOperation $model */
         if ($request->input("owner_id"))$model->ownerPriceOperationOwners()->sync($request->input("owner_id"));
+        LogService::log(__METHOD__,"计费模型-录入作业计费",json_encode($request->input(),JSON_UNESCAPED_UNICODE));
         return response()->redirectTo("maintenance/priceModel/operation")->with("successTip","创建“".$request->input("name")."”成功");
     }
 
@@ -314,6 +327,7 @@ class PriceModelController extends Controller
         //录入中间表
         /** @var OwnerPriceOperation $model */
         if ($request->input("owner_id"))$model->ownerPriceOperationOwners()->sync($request->input("owner_id"));
+        LogService::log(__METHOD__,"计费模型-修改作业计费",json_encode($request->input(),JSON_UNESCAPED_UNICODE));
         return response()->redirectTo("maintenance/priceModel/operation")->with("successTip","修改“".$request->input("name")."”成功");
     }
 
@@ -394,6 +408,7 @@ class PriceModelController extends Controller
             ]);
             $detail->load("province");
         }
+        LogService::log(__METHOD__,"计费模型-修改快递计费",json_encode($request->input(),JSON_UNESCAPED_UNICODE));
         return ["success"=>true,"data"=>$detail];
     }
 
@@ -403,6 +418,7 @@ class PriceModelController extends Controller
         $id = $request->input("id");
         if (!$id)return ["success"=>false,"data"=>"非法参数"];
         app("OwnerPriceExpressService")->destroyDetail($id);
+        LogService::log(__METHOD__,"计费模型-删除快递计费",$id);
         return ["success"=>true];
     }
 
@@ -443,6 +459,7 @@ class PriceModelController extends Controller
         ]);
         $model->owners()->sync($request->input("owner_id"));
         $model->logistics()->sync($request->input("logistic_id"));
+        LogService::log(__METHOD__,"计费模型-录入快递计费",json_encode($request->input(),JSON_UNESCAPED_UNICODE));
         return response()->redirectTo("maintenance/priceModel/express")->with("successTip","录入“".$request->input("name")."”成功");
     }
 
@@ -472,6 +489,7 @@ class PriceModelController extends Controller
         $model->id = $id;
         $model->owners()->sync($request->input("owner_id"));
         $model->logistics()->sync($request->input("logistic_id"));
+        LogService::log(__METHOD__,"计费模型-修改快递计费",json_encode($request->input(),JSON_UNESCAPED_UNICODE));
         return response()->redirectTo("maintenance/priceModel/express")->with("successTip","修改“".$request->input("name")."”成功");
     }
 
@@ -503,6 +521,7 @@ class PriceModelController extends Controller
     {
         if(!Gate::allows('计费模型-快递-删除')){ return ["success"=>false,"data"=>"无权操作"]; };
         app("OwnerPriceExpressService")->destroy($id);
+        LogService::log(__METHOD__,"计费模型-删除快递计费",$id);
         return ["success"=>true];
     }
 
@@ -541,6 +560,7 @@ class PriceModelController extends Controller
         ]);
         $model->owners()->sync($request->input("owner_id"));
         $model->logistics()->sync($request->input("logistic_id"));
+        LogService::log(__METHOD__,"计费模型-录入物流计费",json_encode($request->input(),JSON_UNESCAPED_UNICODE));
         return response()->redirectTo("maintenance/priceModel/logistic")->with("successTip","创建“".$request->input("name")."”成功");
     }
 
@@ -574,6 +594,7 @@ class PriceModelController extends Controller
         $model->id = $id;
         $model->owners()->sync($request->input("owner_id"));
         $model->logistics()->sync($request->input("logistic_id"));
+        LogService::log(__METHOD__,"计费模型-修改物流计费",json_encode($request->input(),JSON_UNESCAPED_UNICODE));
         return response()->redirectTo("maintenance/priceModel/logistic")->with("successTip","修改“".$request->input("name")."”成功");
     }
 
@@ -719,6 +740,7 @@ class PriceModelController extends Controller
             ]);
             $detail->load("province","unit","city");
         }
+        LogService::log(__METHOD__,"计费模型-修改物流计费详情",json_encode($request->input(),JSON_UNESCAPED_UNICODE));
         return ["success"=>true,"data"=>$detail];
     }
 
@@ -728,6 +750,7 @@ class PriceModelController extends Controller
         $id = $request->input("id");
         if (!$id)return ["success"=>false,"data"=>"非法参数"];
         app("OwnerPriceLogisticService")->destroyDetail($id);
+        LogService::log(__METHOD__,"计费模型-删除物流计费详情",$id);
         return ["success"=>true];
     }
 
@@ -788,6 +811,7 @@ class PriceModelController extends Controller
             "base_km" => $request->input("base_km"),
         ]);
         $model->owners()->sync($request->input("owner_id"));
+        LogService::log(__METHOD__,"计费模型-录入直发车计费",json_encode($request->input(),JSON_UNESCAPED_UNICODE));
         return response()->redirectTo("maintenance/priceModel/directLogistic")->with("successTip","创建“".$request->input("name")."”成功");
     }
 
@@ -795,7 +819,10 @@ class PriceModelController extends Controller
     {
         if(!Gate::allows('计费模型-直发-删除')){ return ["success"=>false,"data"=>"无权操作"];  }
         $row = app("OwnerPriceDirectLogisticService")->destroy($id);
-        if ($row == 1)return ["success"=>true];
+        if ($row == 1){
+            LogService::log(__METHOD__,"计费模型-删除直发车计费",$id);
+            return ["success"=>true];
+        }
         return ["success"=>false,"data"=>"影响了“".$row."”行"];
     }
 
@@ -819,6 +846,7 @@ class PriceModelController extends Controller
         $model = new OwnerPriceDirectLogistic();
         $model->id = $id;
         $model->owners()->sync($request->input("owner_id"));
+        LogService::log(__METHOD__,"计费模型-修改直发车计费",json_encode($request->input(),JSON_UNESCAPED_UNICODE));
         return response()->redirectTo("maintenance/priceModel/directLogistic")->with("successTip","修改“".$request->input("name")."”成功");
     }
 
@@ -876,6 +904,7 @@ class PriceModelController extends Controller
             ]);
             $detail->load("carType");
         }
+        LogService::log(__METHOD__,"计费模型-修改直发车计费详情",json_encode($request->input(),JSON_UNESCAPED_UNICODE));
         return ["success"=>true,"data"=>$detail];
     }
 
@@ -885,6 +914,7 @@ class PriceModelController extends Controller
         $id = $request->input("id");
         if (!$id)return ["success"=>false,"data"=>"非法参数"];
         app("OwnerPriceDirectLogisticService")->destroyDetail($id);
+        LogService::log(__METHOD__,"计费模型-删除直发车计费详情",$id);
         return ["success"=>true];
     }
 

app/Services/OwnerAreaReportService.php

@@ -82,4 +82,15 @@ Class OwnerAreaReportService
         return $this->query($query,$params)->get();
     }
 
+    //锁定面积
+    public function lockArea($id = null, $ownerId = null, $countingMonth = null)
+    {
+        if (!$id && !$ownerId && !$countingMonth)return false;
+        $query = OwnerAreaReport::query()->where("status","编辑中");
+        if ($id)$query->where("id",$id);
+        if ($ownerId)$query->where("owner_id",$ownerId);
+        if ($countingMonth)$query->where("counting_month","like",$countingMonth."%");
+        return $query->update(["status","已完成"]);
+    }
+
 }

app/Services/OwnerBillReportService.php

@@ -55,4 +55,13 @@ Class OwnerBillReportService
         if ($withs)$bills->with($withs);
         return $this->query($bills,$params)->get();
     }
+
+    public function first(array $params)
+    {
+        $query = OwnerBillReport::query();
+        foreach ($params as $column=>$param){
+            $query->where($column,$param);
+        }
+        return $query->first();
+    }
 }