service的instant方法和相关trait，方便测试时用桩件替换内部service

app/Console/Commands/ModelMakeCommand.php → app/Console/Commands/MakeModelCommand.php

@@ -4,7 +4,7 @@
 namespace App\Console\Commands;
 
 
-class ModelMakeCommand extends \Illuminate\Foundation\Console\ModelMakeCommand
+class MakeModelCommand extends \Illuminate\Foundation\Console\ModelMakeCommand
 {
     protected function getStub()
     {

app/Console/Commands/MakeServiceCommand.php

@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Traits\ServiceAppAop;
 use Illuminate\Console\Command;
 
 class MakeServiceCommand extends Command
@@ -11,8 +12,8 @@ class MakeServiceCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'make:service 
-    {--provider : Register in the provider}  
+    protected $signature = 'make:service
+    {--provider : Register in the provider}
     {name : fileName}';
 
     /**
@@ -45,7 +46,21 @@ class MakeServiceCommand extends Command
         $fileName=$this->argument('name');
         if (!file_exists(base_path('app\\Services\\'.$fileName.'.php'))){
             file_put_contents(base_path('app\\Services\\'.$fileName.'.php'),
-                '<?php '.PHP_EOL.PHP_EOL.'namespace App\Services; '.PHP_EOL.PHP_EOL.'Class '.$fileName.PHP_EOL.'{ '.PHP_EOL.PHP_EOL.PHP_EOL.'}');
+                '<?php '
+                .PHP_EOL
+                .PHP_EOL
+                .'namespace App\Services;'
+                .PHP_EOL
+                .PHP_EOL
+                .'use App\Traits\ServiceAppAop;'
+                .PHP_EOL
+                .'Class '.$fileName
+                .PHP_EOL
+                .'{ '
+                .'    use ServiceAppAop;'
+                .PHP_EOL
+                .PHP_EOL.
+                '}');
         }
         else $this->error("ERROR: file exists;");
         if ($this->option("provider")){

app/Console/Commands/TestMakeCommand.php → app/Console/Commands/MakeTestCommand.php

@@ -7,7 +7,7 @@ namespace App\Console\Commands;
 use Illuminate\Filesystem\Filesystem;
 use Symfony\Component\Console\Input\InputArgument;
 
-class TestMakeCommand extends \Illuminate\Foundation\Console\TestMakeCommand
+class MakeTestCommand extends \Illuminate\Foundation\Console\TestMakeCommand
 {
     protected $signature = 'make:test {name : The name of the class}
     {--unit : Create a unit test}

app/Console/Kernel.php

@@ -74,7 +74,7 @@ class Kernel extends ConsoleKernel
     {
         $this->load(__DIR__ . '/Commands');
         $this->app->extend('command.model.make',function(ModelMakeCommand $base,$app){
-            return new \App\Console\Commands\ModelMakeCommand($app['files']);
+            return new \App\Console\Commands\MakeModelCommand($app['files']);
         });
         require base_path('routes/console.php');
     }

app/Services/AllInventoryService.php

@@ -4,9 +4,12 @@ namespace App\Services;
 
 use App\Owner;
 use Illuminate\Support\Facades\DB;
+use App\Traits\ServiceAppAop;
+
 
 Class AllInventoryService
 {
+    use ServiceAppAop;
     public function getSql(array $params, $page=null, $paginate=null){
         $ownerCodes=Owner::filterAuthorities()->select('code')->get();
         $date_start=$params['date_start'] ?? null;

app/Services/AuthorityService.php

@@ -8,9 +8,12 @@ use App\Authority;
 use App\Role;
 use Exception;
 use Illuminate\Support\Facades\Cache;
+use App\Traits\ServiceAppAop;
+
 
 class AuthorityService
 {
+    use ServiceAppAop;
 //    /**
 //     * @return Authority[]
 //     */

app/Services/BatchService.php

@@ -4,9 +4,12 @@ namespace App\Services;
 
 use App\Batch;
 use Exception;
+use App\Traits\ServiceAppAop;
+
 
 Class BatchService
 {
+    use ServiceAppAop;
     /** @var StationTaskBatchService $stationTaskBatchService */
     private $stationTaskBatchService;
     /** @var StationRuleBatchService $stationRuleBatchService */
@@ -53,11 +56,11 @@ Class BatchService
      */
     public function assignTasks(array $batches)
     {
-        $this->stationTaskBatchService=app('StationTaskBatchService');
-        $this->stationRuleBatchService=app('StationRuleBatchService');
-        $this->stationTaskService=app('StationTaskService');
-        $this->stationTaskCommodityService=app('StationTaskCommodityService');
-        $this->stationTaskMaterialBoxService=app('StationTaskMaterialBoxService');
+        $this->instant($this->stationTaskBatchService,'StationTaskBatchService');
+        $this->instant($this->stationRuleBatchService,'StationRuleBatchService');
+        $this->instant($this->stationTaskService,'StationTaskService');
+        $this->instant($this->stationTaskCommodityService,'StationTaskCommodityService');
+        $this->instant($this->stationTaskMaterialBoxService,'StationTaskMaterialBoxService');
 
         $batches_canProcess = $this->stationRuleBatchService->getBatches_canProcess($batches); //按规则过滤需要的波次
         if($batches_canProcess->isEmpty()) return;

app/Services/CacheService.php

@@ -5,9 +5,12 @@ namespace App\Services;
 
 
 use Illuminate\Support\Facades\Cache;
+use App\Traits\ServiceAppAop;
+
 
 class CacheService
 {
+    use ServiceAppAop;
     function getOrExecute(String $key, $func, $expiration=null){
         if(!$expiration) $expiration=config('cache.expirations.default');
         return Cache::remember($key, $expiration, $func);

app/Services/CarTypeService.php

@@ -3,9 +3,12 @@
 namespace App\Services;
 
 use App\CarType;
+use App\Traits\ServiceAppAop;
+
 
 Class CarTypeService
 {
+    use ServiceAppAop;
     /*
      * array | string $column
      * 默认一些select字段,可传递string 或 array来指定select字段

app/Services/CarrierService.php

@@ -3,9 +3,12 @@
 namespace App\Services;
 
 use App\Carrier;
+use App\Traits\ServiceAppAop;
+
 
 Class CarrierService
 {
+    use ServiceAppAop;
     public function getSelection(){
         return Carrier::query()->select('id','name')->get();
     }

app/Services/CheckActiveMenuService.php

@@ -13,9 +13,12 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Redis;
+use App\Traits\ServiceAppAop;
+
 
 class CheckActiveMenuService
 {
+    use ServiceAppAop;
     /**
      *同步数据到数据库并且将L1转移到L2
      */

app/Services/CityService.php

@@ -4,9 +4,12 @@ namespace App\Services;
 
 use App\City;
 use Illuminate\Support\Str;
+use App\Traits\ServiceAppAop;
+
 
 Class CityService
 {
+    use ServiceAppAop;
     public static $cities = ['汕头','汕尾'];
 
     /*

app/Services/CommodityBarcodeService.php

@@ -7,9 +7,12 @@ use App\CommodityBarcode;
 use App\Services\common\DataHandlerService;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
+use App\Traits\ServiceAppAop;
+
 
 Class CommodityBarcodeService
 {
+    use ServiceAppAop;
     public function getCommodities(array $codes, $owner_id){
         return CommodityBarcode::query()->whereHas('commodity',function ($query)use($owner_id){
             $query->where('owner_id',$owner_id);

app/Services/CommodityService.php

@@ -14,9 +14,12 @@ use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Cache;
+use App\Traits\ServiceAppAop;
+
 
 Class CommodityService
 {
+    use ServiceAppAop;
 
     /**
      * @var CacheService $cacheService

app/Services/CustomerLogService.php

@@ -1,11 +1,14 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\CustomerLog;
+use App\Traits\ServiceAppAop;
+
 
 Class CustomerLogService
-{ 
+{
+    use ServiceAppAop;
     public function get(array $params, array $withs=[])
     {
         $query = CustomerLog::query()->with($withs)->orderByDesc('id');
@@ -31,4 +34,4 @@ Class CustomerLogService
         return CustomerLog::query()->create($values);
     }
 
-}
+}

app/Services/CustomerLogStatusService.php

@@ -1,11 +1,14 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\CustomerLogStatus;
+use App\Traits\ServiceAppAop;
+
 
 Class CustomerLogStatusService
-{ 
+{
+    use ServiceAppAop;
     public function update(array $params, array $values)
     {
         $query = CustomerLogStatus::query();
@@ -30,4 +33,4 @@ Class CustomerLogStatusService
     {
         return CustomerLogStatus::query()->get($column);
     }
-}
+}

app/Services/CustomerService.php

@@ -5,9 +5,12 @@ namespace App\Services;
 use App\Customer;
 use App\Services\common\QueryService;
 use Illuminate\Database\Eloquent\Builder;
+use App\Traits\ServiceAppAop;
+
 
 Class CustomerService
 {
+    use ServiceAppAop;
     public function getSelection($column = ['id', 'name'])
     {
         return Customer::query()->select($column)->get();

app/Services/DepositoryService.php

@@ -1,13 +1,16 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\Depository;
+use App\Traits\ServiceAppAop;
+
 
 Class DepositoryService
-{ 
+{
+    use ServiceAppAop;
     public function firstOrCreate(array $params, array $values = null){
         if (!$values) $values = $params;
         return Depository::query()->firstOrCreate($params, $values);
     }
-}
+}

app/Services/DocWaveHeaderService.php

@@ -1,15 +1,18 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\ValueStore;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Yajra\Oci8\Query\OracleBuilder;
+use App\Traits\ServiceAppAop;
+
 
 Class DocWaveHeaderService
-{ 
+{
+    use ServiceAppAop;
 
     public function get(array $params, $rule = [])
     {
@@ -52,4 +55,4 @@ Class DocWaveHeaderService
         $valueStore = ValueStore::query()->where("name","wave_last_sync_date");
         return $valueStore->update(["value"=>$value]);
     }
-}
+}

app/Services/FeatureService.php

@@ -1,11 +1,14 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\Feature;
+use App\Traits\ServiceAppAop;
+
 
 Class FeatureService
 {
+    use ServiceAppAop;
     public function getMapArray()
     {
         $features = Feature::query()->get();
@@ -289,4 +292,4 @@ Class FeatureService
         return "false";
     }
 
-}
+}

app/Services/ForeignHaiRoboticsService.php

@@ -12,9 +12,12 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Http;
 use Ramsey\Collection\Collection;
+use App\Traits\ServiceAppAop;
+
 
 class ForeignHaiRoboticsService
 {
+    use ServiceAppAop;
     /**
      * @param string $modeName '输送线入立架'|'立架出至输送线'|'移动立架内位置'|'缓存架入立架'|'立架出至缓存架'
      * @param string $fromLocation

app/Services/InventoryAccountMissionService.php

@@ -1,14 +1,17 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\Services\common\BatchUpdateService;
+use App\Traits\ServiceAppAop;
+
 
 Class InventoryAccountMissionService
 {
+    use ServiceAppAop;
 
     public function batchUpdateItself($column, array $params)
     {
         return app(BatchUpdateService::class)->batchUpdateItself('inventory_account_missions', $column, $params);
     }
-}
+}

app/Services/InventoryAccountService.php

@@ -20,9 +20,12 @@ use Carbon\Carbon;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use function GuzzleHttp\Psr7\_parse_message;
+use App\Traits\ServiceAppAop;
+
 
 class InventoryAccountService
 {
+    use ServiceAppAop;
     private function conditionQueryInventoryAccountMission(array $params){
         $inventoryAccountMissions=InventoryAccountMission::with(['commodity.barcodes','stockInventoryPersons'])->orderBy('difference_amount','desc');
         $columnQueryRules=[];

app/Services/InventoryCompareService.php

@@ -15,9 +15,12 @@ use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Overtrue\Pinyin\Pinyin;
 use Ramsey\Uuid\Uuid;
+use App\Traits\ServiceAppAop;
+
 
 class InventoryCompareService
 {
+    use ServiceAppAop;
     static private $missionCode;
     public function getCreatingMissionCode($ownerName=''){
         if(self::$missionCode)return self::$missionCode;

app/Services/InventoryDailyLogService.php

@@ -1,14 +1,17 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\InventoryDailyLog;
 use App\InventoryDailyLoggingOwner;
 use App\Services\common\BatchUpdateService;
 use App\Services\common\QueryService;
+use App\Traits\ServiceAppAop;
+
 
 Class InventoryDailyLogService
 {
+    use ServiceAppAop;
     //库存体积条件
     function conditionQuery(array $param){
         $inventoryDailyLogs = InventoryDailyLog::query()->with(['depository','owner','commodity'=>function($query){
@@ -62,4 +65,4 @@ Class InventoryDailyLogService
         return app(BatchUpdateService::class)->batchUpdateItself('inventory_daily_logs', $column, $params);
     }
 
-}
+}

app/Services/InventoryService.php

@@ -8,9 +8,12 @@ use App\InventoryDailyLoggingOwner;
 use App\Owner;
 use App\Services\common\QueryService;
 use Illuminate\Support\Facades\DB;
+use App\Traits\ServiceAppAop;
+
 
 class InventoryService
 {
+    use ServiceAppAop;
     public function getSql(array $params,$page=null,$paginate=null){
         $ownerCodes=Owner::filterAuthorities()->select('code')->get();
         $date_start=$params['date_start'] ?? null;

app/Services/LaborReportService.php

@@ -22,9 +22,12 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Gate;
 
+use App\Traits\ServiceAppAop;
+
 
 class LaborReportService
 {
+    use ServiceAppAop;
     private function conditionQuery(array $params){
         $user=Auth::user();
         $laborReports=LaborReport::query()

app/Services/LaborReportsCountingRecordService.php

@@ -11,9 +11,12 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
 use Ramsey\Uuid\Type\Integer;
+use App\Traits\ServiceAppAop;
+
 
 class LaborReportsCountingRecordService
 {
+    use ServiceAppAop;
     public function __construct(LaborReport $laborReport)
     {
         $laborReport::$withoutAppends = false;

app/Services/LogService.php

@@ -7,9 +7,12 @@ namespace App\Services;
 use App\Log;
 use Exception;
 use Illuminate\Support\Facades\Redis;
+use App\Traits\ServiceAppAop;
+
 
 class LogService
 {
+    use ServiceAppAop;
     static public function log($class, $method, $description, $id_user = null,$type='log')
     {
         if (!$id_user) {

app/Services/LogisticService.php

@@ -10,13 +10,16 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
+use App\Traits\ServiceAppAop;
+
 
 Class LogisticService
 {
+    use ServiceAppAop;
     /** @var CacheService $cacheService */
     private $cacheService;
     function __construct(){
-        $this->cacheService=app('CacheService');
+        $this->instant($this->cacheService,'CacheService');
     }
     public function getSelection($column = ['id','name'], $type = '快递'){
         return $this->cacheService->getOrExecute('LogisticAll_'.implode("",$column).Str::studly($type),function()use($column,$type){

app/Services/LogisticTimingService.php

@@ -5,9 +5,12 @@ namespace App\Services;
 use App\Logistic;
 use App\LogisticTiming;
 use App\Province;
+use App\Traits\ServiceAppAop;
+
 
 Class LogisticTimingService
 {
+    use ServiceAppAop;
 
     public function findByParams($cityName,$provinceName,$logisticId)
     {

app/Services/MaterialBoxService.php

@@ -6,9 +6,12 @@ namespace App\Services;
 
 use App\MaterialBox;
 use Illuminate\Support\Facades\Cache;
+use App\Traits\ServiceAppAop;
+
 
 class MaterialBoxService
 {
+    use ServiceAppAop;
 
     function get(array $kvPairs){
         ksort($kvPairs);

app/Services/NewOrderCountingRecordService.php

@@ -12,9 +12,12 @@ use Carbon\Carbon;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
+use App\Traits\ServiceAppAop;
+
 
 class NewOrderCountingRecordService
 {
+    use ServiceAppAop;
     public function orderCountingRecordsFromCache($start, $end, $unit, $ownerIds)
     {
         $dataList = collect();

app/Services/OracleActAllocationDetailService.php

@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 namespace App\Services;
 
@@ -8,9 +8,12 @@ use Illuminate\Support\Facades\DB;
 /**
  * connection : oracle
  * table : ACT_ALLOCATION_DETAILS
- */
+ */use App\Traits\ServiceAppAop;
+
+
 Class OracleActAllocationDetailService
 {
+    use ServiceAppAop;
     private function query($sql, array $params){
         if ($params['checktime_start'] ?? false){
             $sql .= " AND checktime >= '".$params['checktime_start'].":00'";
@@ -63,4 +66,4 @@ Class OracleActAllocationDetailService
         /** @var OracleActAllocationDetails $actAllocationDetail */
         return $actAllocationDetail->first();
     }
-}
+}

app/Services/OracleBasCustomerService.php

@@ -3,14 +3,17 @@
 namespace App\Services;
 
 use App\OracleBasCustomer;
+use App\Traits\ServiceAppAop;
+
 
 Class OracleBasCustomerService
 {
+    use ServiceAppAop;
     /** @var CacheService $cacheService */
     private $cacheService;
 
     function __construct(){
-        $this->cacheService=app('CacheService');
+        $this->instant($this->cacheService,'CacheService');
     }
 
     public function get(array $params){

app/Services/OracleBasSkuService.php

@@ -4,9 +4,12 @@ namespace App\Services;
 
 use App\OracleBasSKU;
 use Illuminate\Support\Facades\DB;
+use App\Traits\ServiceAppAop;
+
 
 Class OracleBasSkuService
 {
+    use ServiceAppAop;
     public function getOwnerCommodities(array $params){
         $query = OracleBasSKU::query();
         if ($params['code'] ?? false){

app/Services/OracleDOCOrderHeaderService.php

@@ -8,9 +8,12 @@ use App\OracleBasCustomer;
 use App\OracleDOCOrderDetail;
 use App\OracleDOCOrderHeader;
 use App\Owner;
+use App\Traits\ServiceAppAop;
+
 
 Class OracleDOCOrderHeaderService
 {
+    use ServiceAppAop;
 
     static $columns =[
         'DOC_Order_Header.OrderNo','DOC_Order_Header.CustomerID','DOC_Order_Header.OrderTime',

app/Services/OracleDocAsnDetailService.php

@@ -3,9 +3,12 @@
 namespace App\Services;
 
 use App\OracleDOCASNDetail;
+use App\Traits\ServiceAppAop;
+
 
 Class OracleDocAsnDetailService
 {
+    use ServiceAppAop;
     const TABLE = "DOC_ASN_DETAILS";
     public function getLeftJoinBasSku(array $params){
         $query = OracleDOCASNDetail::query();

app/Services/OracleDocAsnHerderService.php

@@ -3,9 +3,12 @@
 namespace App\Services;
 
 use App\OracleDOCASNHeader;
+use App\Traits\ServiceAppAop;
+
 
 Class OracleDocAsnHerderService
 {
+    use ServiceAppAop;
     public function getWmsAsnOnStartDateCreate($startDate)
     {
         if (!$startDate) return null;

app/Services/OracleDocWaveDetailService.php

@@ -7,9 +7,12 @@ use App\OracleDOCWaveDetails;
 use App\ValueStore;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Cache;
+use App\Traits\ServiceAppAop;
+
 
 class OracleDocWaveDetailService
 {
+    use ServiceAppAop;
     public function clearCancelledOrder($orderHeaders)
     {
         if (!$orderHeaders) return;

app/Services/OrderCommodityAssignService.php

@@ -1,11 +1,14 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\OrderCommodityAssign;
+use App\Traits\ServiceAppAop;
+
 
 Class OrderCommodityAssignService
-{ 
+{
+    use ServiceAppAop;
 
     public function paginate(array $params = null)
     {
@@ -28,4 +31,4 @@ Class OrderCommodityAssignService
         return $query->get();
     }
 
-}
+}

app/Services/OrderCommodityService.php

@@ -7,9 +7,12 @@ use App\OrderCommodity;
 use App\Services\common\BatchUpdateService;
 use App\Services\common\DataHandlerService;
 use Carbon\Carbon;
+use App\Traits\ServiceAppAop;
+
 
 Class OrderCommodityService
 {
+    use ServiceAppAop;
 
     public function insert($innerParams){
         if(!$innerParams)return false;

app/Services/OrderIssuePerformanceService.php

@@ -14,9 +14,12 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Maatwebsite\Excel\Facades\Excel;
 
+use App\Traits\ServiceAppAop;
+
 
 class OrderIssuePerformanceService
 {
+    use ServiceAppAop;
     public function paginate(array $params)
     {
         $paginate = $params['paginate'] ?? 50;

app/Services/OrderIssueProcessLogService.php

@@ -5,9 +5,12 @@ namespace App\Services;
 use App\OrderIssue;
 use App\OrderIssueProcessLog;
 use Illuminate\Support\Facades\Auth;
+use App\Traits\ServiceAppAop;
+
 
 class OrderIssueProcessLogService
 {
+    use ServiceAppAop;
 
     public function batchStoreAndReturnLogs($params)
     {

app/Services/OrderIssueService.php

@@ -17,9 +17,12 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 use Ramsey\Uuid\Uuid;
+use App\Traits\ServiceAppAop;
+
 
 class OrderIssueService
 {
+    use ServiceAppAop;
     public function __construct()
     {
         app()->bind("orderService", OrderService::class);

app/Services/OrderIssueWorkLoadService.php

@@ -10,9 +10,12 @@ use App\Services\common\QueryService;
 use App\User;
 use Illuminate\Support\Facades\Auth;
 use Maatwebsite\Excel\Facades\Excel;
+use App\Traits\ServiceAppAop;
+
 
 class OrderIssueWorkLoadService
 {
+    use ServiceAppAop;
     public function getQuery(array $queryParam)
     {
         $user = Auth::user();

app/Services/OrderPackageCommoditiesService.php

@@ -14,9 +14,12 @@ use App\Services\common\BatchUpdateService;
 use App\Services\common\DataHandlerService;
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
+use App\Traits\ServiceAppAop;
+
 
 class OrderPackageCommoditiesService
 {
+    use ServiceAppAop;
     public function insert(array $params){
         return OrderPackageCommodities::query()->insert($params);
     }

app/Services/OrderPackageService.php

@@ -12,9 +12,12 @@ use App\OrderTracking;
 use App\Services\common\BatchUpdateService;
 use App\Services\common\DataHandlerService;
 use Carbon\Carbon;
+use App\Traits\ServiceAppAop;
+
 
 class OrderPackageService
 {
+    use ServiceAppAop;
     public function batchUpdate(array $params){
         return app(BatchUpdateService::class)->batchUpdate('order_packages',$params);
     }

app/Services/OrderService.php

@@ -22,9 +22,12 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
+use App\Traits\ServiceAppAop;
+
 
 class OrderService
 {
+    use ServiceAppAop;
     /**
      * @var OracleDOCOrderHeaderService $oracleDOCOrderHeaderService
      * @var OrderPackageService $packageService

app/Services/OrderTrackingOwnerService.php

@@ -3,9 +3,12 @@
 namespace App\Services;
 
 use App\Owner;
+use App\Traits\ServiceAppAop;
+
 
 class OrderTrackingOwnerService
 {
+    use ServiceAppAop;
 
     public function getTrackingOrderOwner()
     {

app/Services/OrderTrackingService.php

@@ -13,9 +13,12 @@ use App\Services\common\QueryService;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
+use App\Traits\ServiceAppAop;
+
 
 class OrderTrackingService
 {
+    use ServiceAppAop;
     public function insert($params){
         return OrderTracking::query()->insert($params);
     }

app/Services/OwnerAreaReportService.php

@@ -1,15 +1,18 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\OwnerAreaReport;
 use App\OwnerBillReport;
 use App\Services\common\QueryService;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\DB;
+use App\Traits\ServiceAppAop;
+
 
 Class OwnerAreaReportService
 {
+    use ServiceAppAop;
     /**
      * @param Builder $builder
      * @param array $params
@@ -93,4 +96,4 @@ Class OwnerAreaReportService
         return $query->update(["status"=>"已完成"]);
     }
 
-}
+}

app/Services/OwnerBillReportService.php

@@ -1,13 +1,16 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\OwnerBillReport;
 use App\Services\common\QueryService;
 use Illuminate\Database\Eloquent\Builder;
+use App\Traits\ServiceAppAop;
+
 
 Class OwnerBillReportService
 {
+    use ServiceAppAop;
 
     /**
      * @param Builder $builder
@@ -64,4 +67,4 @@ Class OwnerBillReportService
         }
         return $query->first();
     }
-}
+}

app/Services/OwnerFeeDetailService.php

@@ -1,13 +1,16 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\OwnerFeeDetail;
 use App\Services\common\QueryService;
 use Illuminate\Database\Eloquent\Builder;
+use App\Traits\ServiceAppAop;
+
 
 Class OwnerFeeDetailService
 {
+    use ServiceAppAop;
     /**
      * @param Builder $builder
      * @param array $params
@@ -75,4 +78,4 @@ Class OwnerFeeDetailService
         return $detail->update($values);
     }
 
-}
+}

app/Services/OwnerOutStorageRuleService.php

@@ -1,11 +1,14 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\OwnerOutStorageRule;
+use App\Traits\ServiceAppAop;
+
 
 Class OwnerOutStorageRuleService
-{ 
+{
+    use ServiceAppAop;
     public function get(array $params, array $withs = [], $isTranslateFeature = false, array $translateColumn = [])
     {
         if ($isTranslateFeature){
@@ -54,4 +57,4 @@ Class OwnerOutStorageRuleService
         }
         return $query->count();
     }
-}
+}

app/Services/OwnerPriceDirectLogisticService.php

@@ -1,15 +1,18 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\Owner;
 use App\OwnerPriceDirectLogistic;
 use App\OwnerPriceDirectLogisticCar;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\DB;
+use App\Traits\ServiceAppAop;
+
 
 Class OwnerPriceDirectLogisticService
-{ 
+{
+    use ServiceAppAop;
     public function paginate($id = null)
     {
         $query = OwnerPriceDirectLogistic::query()->with("owners");
@@ -108,4 +111,4 @@ Class OwnerPriceDirectLogisticService
         $amount -= $model->base_km;
         return ($amount*$model->details[0]->additional_fee)+$initialMoney;
     }
-}
+}

app/Services/OwnerPriceExpressService.php

@@ -1,6 +1,6 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\Logistic;
 use App\Owner;
@@ -8,9 +8,12 @@ use App\OwnerPriceExpress;
 use App\OwnerPriceExpressProvince;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\DB;
+use App\Traits\ServiceAppAop;
+
 
 Class OwnerPriceExpressService
-{ 
+{
+    use ServiceAppAop;
 
     public function paginate($id = null)
     {
@@ -132,4 +135,4 @@ Class OwnerPriceExpressService
         $weight -= $model->initial_weight;
         return (ceil($weight/$model->additional_weight)*$model->details[0]->additional_weight_price)+$initialMoney;
     }
-}
+}

app/Services/OwnerPriceLogisticService.php

@@ -1,13 +1,16 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\OwnerPriceLogistic;
 use App\OwnerPriceLogisticDetail;
 use Illuminate\Database\Eloquent\Builder;
+use App\Traits\ServiceAppAop;
+
 
 Class OwnerPriceLogisticService
-{ 
+{
+    use ServiceAppAop;
     public function paginate($id = null)
     {
         $query = OwnerPriceLogistic::query()->with(["owners","logistics","unit","otherUnit"]);
@@ -141,4 +144,4 @@ Class OwnerPriceLogisticService
         if ($money < $detail->initial_fee)$money = $detail->initial_fee; //小于起始计费以起始计费为准
         return $money+$detail->delivery_fee+$fee;
     }
-}
+}

app/Services/OwnerPriceOperationService.php

@@ -1,6 +1,6 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\OwnerInStorageRule;
 use App\OwnerOutStorageRule;
@@ -10,9 +10,12 @@ use App\Unit;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
+use App\Traits\ServiceAppAop;
+
 
 Class OwnerPriceOperationService
 {
+    use ServiceAppAop;
     /**
      * @param Builder $builder
      * @param array $params
@@ -293,4 +296,4 @@ Class OwnerPriceOperationService
             $this->settingCount($packages,$amountColumn,$startNumber);
         }
     }
-}
+}

app/Services/OwnerReportService.php

@@ -1,13 +1,16 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\OwnerReport;
 use App\Services\common\QueryService;
 use Illuminate\Database\Eloquent\Builder;
+use App\Traits\ServiceAppAop;
+
 
 Class OwnerReportService
 {
+    use ServiceAppAop;
     /**
      * @param Builder $builder
      * @param array $params
@@ -59,4 +62,4 @@ Class OwnerReportService
         return $this->query($query,$params)->paginate($params["paginate"] ?? 50);
     }
 
-}
+}

app/Services/OwnerService.php

@@ -11,13 +11,16 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
+use App\Traits\ServiceAppAop;
+
 
 Class OwnerService
 {
+    use ServiceAppAop;
     /** @var CacheService $cacheService */
     private $cacheService;
     function __construct(){
-        $this->cacheService=app('CacheService');
+        $this->instant($this->cacheService,'CacheService');
     }
     /*
      * array | string $column
@@ -294,7 +297,7 @@ sql
             if (!$owner)return false;
         }
         $sql = DB::raw(<<<sql
-    update BAS_CUSTOMER set ACTIVE_FLAG = ?,EDITTIME = TO_DATE(?,'yyyy-mm-dd hh24:mi:ss'),EDITWHO = ? where CUSTOMERID = ? and CUSTOMER_TYPE = ? 
+    update BAS_CUSTOMER set ACTIVE_FLAG = ?,EDITTIME = TO_DATE(?,'yyyy-mm-dd hh24:mi:ss'),EDITWHO = ? where CUSTOMERID = ? and CUSTOMER_TYPE = ?
 sql
         );
         $date = date('Y-m-d H:i:s');

app/Services/OwnerStoragePriceModelService.php

@@ -1,12 +1,15 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\OwnerReport;
 use App\OwnerStoragePriceModel;
+use App\Traits\ServiceAppAop;
+
 
 Class OwnerStoragePriceModelService
-{ 
+{
+    use ServiceAppAop;
     public function getSelection(array $columns = ["counting_type","using_type"], array $withs = [])
     {
         return OwnerStoragePriceModel::query()->select($columns)->with($withs)->get();
@@ -63,4 +66,4 @@ Class OwnerStoragePriceModelService
         }
         return $money;
     }
-}
+}

app/Services/PackageService.php

@@ -7,9 +7,12 @@ use App\Services\common\QueryService;
 use Illuminate\Http\Request;
 
 const TABLE = "order_packages.";
+use App\Traits\ServiceAppAop;
+
 
 Class PackageService
 {
+    use ServiceAppAop;
     private function conditionQuery($params){
         $packages = OrderPackage::query()->with(['order'=>function($query){
             $query->with('owner','logistic');

app/Services/PackageStatisticsService.php

@@ -7,9 +7,12 @@ use App\Services\common\QueryService;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
+use App\Traits\ServiceAppAop;
+
 
 Class PackageStatisticsService
 {
+    use ServiceAppAop;
     /**
      * @param array $params
      * @return Builder

app/Services/ProcessMethodService.php

@@ -1,12 +1,15 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 
 use App\ProcessMethod;
+use App\Traits\ServiceAppAop;
+
 
 Class ProcessMethodService
 {
+    use ServiceAppAop;
     public function getSelection($column = ['id','name']){
         return ProcessMethod::query()->select($column)->get();
     }
@@ -41,4 +44,4 @@ Class ProcessMethodService
         return ProcessMethod::destroy($id);
     }
 
-}
+}

app/Services/ProcessService.php

@@ -6,9 +6,12 @@ use App\Process;
 use App\Services\common\QueryService;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\DB;
+use App\Traits\ServiceAppAop;
+
 
 Class ProcessService
 {
+    use ServiceAppAop;
     /**
      * @param array $params
      * @return Builder

app/Services/ProcessStatisticService.php

@@ -1,13 +1,16 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\ProcessStatistic;
 use App\Services\common\QueryService;
 use Illuminate\Database\Eloquent\Builder;
+use App\Traits\ServiceAppAop;
+
 
 Class ProcessStatisticService
-{ 
+{
+    use ServiceAppAop;
     private function conditionQuery(array $params){
         $query = ProcessStatistic::with(['process'/*,'operatorLogSubmit'*/])->orderBy('process_statistics.process_id','DESC')
             ->has('process');
@@ -63,4 +66,4 @@ Class ProcessStatisticService
             ->sql();
     }
 
-}
+}

app/Services/ProcessesContentService.php

@@ -1,14 +1,17 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\Services\common\BatchUpdateService;
+use App\Traits\ServiceAppAop;
+
 
 Class ProcessesContentService
 {
+    use ServiceAppAop;
 
     public function batchUpdateItself($column, array $params)
     {
         return app(BatchUpdateService::class)->batchUpdateItself('processes_contents', $column, $params);
     }
-}
+}

app/Services/ProvinceService.php

@@ -4,9 +4,12 @@ namespace App\Services;
 
 use App\Province;
 use Illuminate\Support\Str;
+use App\Traits\ServiceAppAop;
+
 
 Class ProvinceService
 {
+    use ServiceAppAop;
     public static $provinces = ['青海','新疆','内蒙古','广西','西藏','宁夏','北京','上海','重庆','天津'];
 
 

app/Services/QualityLabelService.php

@@ -3,13 +3,16 @@
 namespace App\Services;
 
 use App\QualityLabel;
+use App\Traits\ServiceAppAop;
+
 
 Class QualityLabelService
 {
+    use ServiceAppAop;
     /** @var CacheService $cacheService */
     private $cacheService;
     function __construct(){
-        $this->cacheService=app('CacheService');
+        $this->instant($this->cacheService,'CacheService');
     }
     public function get(){
         return $this->cacheService->getOrExecute('QualityLabelAll',function(){

app/Services/RealtimePendingOrdersService.php

@@ -9,9 +9,12 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
+use App\Traits\ServiceAppAop;
+
 
 class RealtimePendingOrdersService
 {
+    use ServiceAppAop;
     /**
      * 获取实时待处理订单
      * @param null $start

app/Services/RejectedBillItemService.php

@@ -1,13 +1,16 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\RejectedBillItem;
+use App\Traits\ServiceAppAop;
+
 
 Class RejectedBillItemService
-{ 
+{
+    use ServiceAppAop;
     public function insert(array $params){
         return RejectedBillItem::query()->insert($params);
     }
 
-}
+}

app/Services/RejectedBillService.php

@@ -8,9 +8,12 @@ use App\RejectedBill;
 use App\Services\common\BatchUpdateService;
 use App\Services\common\DataHandlerService;
 use Carbon\Carbon;
+use App\Traits\ServiceAppAop;
+
 
 Class RejectedBillService
 {
+    use ServiceAppAop;
     private function conditionQuery(array $params)
     {
         $query = RejectedBill::query();

app/Services/RejectedService.php

@@ -10,13 +10,16 @@ use App\RejectedBill;
 use App\Services\common\QueryService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use App\Traits\ServiceAppAop;
+
 
 class RejectedService
 {
+    use ServiceAppAop;
     /** @var CacheService $cacheService */
     private $cacheService;
     function __construct(){
-        $this->cacheService=app('CacheService');
+        $this->instant($this->cacheService,'CacheService');
     }
     private function conditionQuery(array $param)
     {

app/Services/ShopService.php

@@ -8,13 +8,16 @@ use App\Services\common\BatchUpdateService;
 use App\Shop;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Cache;
+use App\Traits\ServiceAppAop;
+
 
 class ShopService
 {
+    use ServiceAppAop;
     /** @var CacheService $cacheService */
     private $cacheService;
     function __construct(){
-        $this->cacheService=app('CacheService');
+        $this->instant($this->cacheService,'CacheService');
     }
 
     public function getSelection(array $column = ['id', 'name'])

app/Services/StationRuleBatchService.php

@@ -9,9 +9,12 @@ use App\StationRuleBatch;
 use App\StationType;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
+use App\Traits\ServiceAppAop;
+
 
 class StationRuleBatchService
 {
+    use ServiceAppAop;
     function getByBatch(Batch $batch): StationRuleBatch
     {
         $batchType = $batch['type'] ?? 'null';

app/Services/StationService.php

@@ -10,9 +10,12 @@ use App\StationTask;
 use App\StationType;
 use Exception;
 use Illuminate\Support\Facades\Cache;
+use App\Traits\ServiceAppAop;
+
 
 class StationService
 {
+    use ServiceAppAop;
     /**
      * @param string $typeName
      * @return Station

app/Services/StationTaskBatchService.php

@@ -13,9 +13,12 @@ use App\StationTaskBatchType;
 use Exception;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
+use App\Traits\ServiceAppAop;
+
 
 class StationTaskBatchService
 {
+    use ServiceAppAop;
     /** @var StationService $stationService */
     private $stationService;
     /** @var StationTaskBatchTypeService $stationTaskBatchTypeService */

app/Services/StationTaskBatchTypeService.php

@@ -8,9 +8,12 @@ use App\Station;
 use App\StationTaskBatchType;
 use App\StationType;
 use Illuminate\Support\Facades\Cache;
+use App\Traits\ServiceAppAop;
+
 
 class StationTaskBatchTypeService
 {
+    use ServiceAppAop;
     /**
      * @param string $key
      * @param string $value

app/Services/StationTaskChildService.php

@@ -7,9 +7,12 @@ namespace App\Services;
 use App\StationTaskBatch;
 use App\StationTaskChild;
 use Illuminate\Support\Facades\Cache;
+use App\Traits\ServiceAppAop;
+
 
 class StationTaskChildService
 {
+    use ServiceAppAop;
 
     function get(array $kvPairs){
         ksort($kvPairs);

app/Services/StationTaskCommodityService.php

@@ -9,9 +9,12 @@ use App\OrderCommodity;
 use App\StationTaskCommodity;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
+use App\Traits\ServiceAppAop;
+
 
 class StationTaskCommodityService
 {
+    use ServiceAppAop;
     /** @var StationService $stationService */
     private $stationService;
     /** @var StationTypeService $stationTypeService */
@@ -39,7 +42,7 @@ class StationTaskCommodityService
     }
     function createByBatches(array $batches,Collection $stationTasks_toAttach): Collection
     {
-        $this->stationTaskService=app('StationTaskService');
+        $this->instant($this->stationTaskService,'StationTaskService');
         $stationTaskCommodities_listByBatch=new Collection();
         foreach ($batches as $batch){
             $stationTaskCommodities_listByBatch->push(
@@ -52,9 +55,9 @@ class StationTaskCommodityService
 
     function createByBatch(Batch $batch): Collection
     {
-        $this->stationTypeService=app('StationTypeService');
-        $this->stationService=app('StationService');
-        $this->materialBoxService=app('MaterialBoxService');
+        $this->instant($this->stationTypeService,'StationTypeService');
+        $this->instant($this->stationService,'StationService');
+        $this->instant($this->materialBoxService,'MaterialBoxService');
         $stationTaskCommodities_toCreate=new Collection();
         $order_ids=data_get($batch['orders'],'*.id');
         $orderCommodities=OrderCommodity::query()->with('orderBin')->whereIn('order_id',$order_ids)->get();

app/Services/StationTaskMaterialBoxService.php

@@ -9,9 +9,12 @@ use App\OrderCommodity;
 use App\StationTaskMaterialBox;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
+use App\Traits\ServiceAppAop;
+
 
 class StationTaskMaterialBoxService
 {
+    use ServiceAppAop;
     /** @var StationService $stationService */
     private $stationService;
     /** @var StationTypeService $stationTypeService */
@@ -40,9 +43,9 @@ class StationTaskMaterialBoxService
 
     function createByBatch(Batch $batch): Collection
     {
-        $this->materialBoxService=app('MaterialBoxService');
-        $this->stationTypeService=app('StationTypeService');
-        $this->stationService=app('StationService');
+        $this->instant($this->materialBoxService,'MaterialBoxService');
+        $this->instant($this->stationTypeService,'StationTypeService');
+        $this->instant($this->stationService,'StationService');
         $stationMaterialBoxes_toCreate=new Collection();
         $order_ids=data_get($batch['orders'],'*.id');
         $orderCommodities=OrderCommodity::query()->with('orderBin')->whereIn('order_id',$order_ids)->get();

app/Services/StationTaskService.php

@@ -10,9 +10,12 @@ use App\StationTaskChild;
 use App\StationTaskCommodity;
 use App\StationTaskMaterialBox;
 use Illuminate\Support\Collection;
+use App\Traits\ServiceAppAop;
+
 
 class StationTaskService
 {
+    use ServiceAppAop;
     /** @var StationTaskChildService $stationTaskChildService  */
     private $stationTaskChildService;
     public function __construct()
@@ -38,7 +41,7 @@ class StationTaskService
      */
     function registerSubTasks(Collection $tasks, Collection $subTaskLists): array
     {
-        $this->stationTaskChildService=app('StationTaskChildService');
+        $this->instant($this->stationTaskChildService,'StationTaskChildService');
         $taskChildren_toInsert=collect();
         foreach ($subTaskLists as $i=>$subTaskList){
             foreach ($subTaskList as $subTask){

app/Services/StationTypeService.php

@@ -7,9 +7,12 @@ namespace App\Services;
 use App\Batch;
 use App\StationRuleBatch;
 use App\StationType;
+use App\Traits\ServiceAppAop;
+
 
 class StationTypeService
 {
+    use ServiceAppAop;
     /** @var StationRuleBatchService $stationRuleBatchService */
     private $stationRuleBatchService;
     public function __construct()
@@ -19,7 +22,7 @@ class StationTypeService
 
     function getByBatch(Batch $batch): StationType
     {
-        $this->stationRuleBatchService=app('StationRuleBatchService');
+        $this->instant($this->stationRuleBatchService,'StationRuleBatchService');
         $stationRuleBatch=$this->stationRuleBatchService->getByBatch($batch);
         return $stationRuleBatch['stationType'];
     }

app/Services/StoreCheckingReceiveItemService.php

@@ -1,12 +1,15 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\Services\common\BatchUpdateService;
 use App\StoreCheckingReceiveItem;
+use App\Traits\ServiceAppAop;
+
 
 Class StoreCheckingReceiveItemService
-{ 
+{
+    use ServiceAppAop;
     public function insert(array $params){
         return StoreCheckingReceiveItem::query()->insert($params);
     }
@@ -48,4 +51,4 @@ Class StoreCheckingReceiveItemService
         return app(BatchUpdateService::class)->batchUpdateItself('store_checking_receive_items', $column, $params);
     }
 
-}
+}

app/Services/StoreCheckingReceiveService.php

@@ -1,13 +1,16 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\Services\common\QueryService;
 use App\StoreCheckingReceive;
 use Illuminate\Database\Eloquent\Builder;
+use App\Traits\ServiceAppAop;
+
 
 Class StoreCheckingReceiveService
 {
+    use ServiceAppAop;
     /**
      * @param Builder $query
      * @param array $params
@@ -46,4 +49,4 @@ Class StoreCheckingReceiveService
         $storeCheckingReceive->update($params);
         return $storeCheckingReceive;
     }
-}
+}

app/Services/StoreItemService.php

@@ -8,9 +8,12 @@ use App\Services\common\BatchUpdateService;
 use App\Services\common\DataHandlerService;
 use App\Store;
 use App\StoreItems;
+use App\Traits\ServiceAppAop;
+
 
 Class StoreItemService
 {
+    use ServiceAppAop;
     public function insert(array $params)
     {
         return StoreItems::query()->insert($params);

app/Services/StoreService.php

@@ -10,9 +10,12 @@ use App\ValueStore;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Cache;
 
+use App\Traits\ServiceAppAop;
+
 
 Class StoreService
 {
+    use ServiceAppAop;
     private function conditionQuery(array $params)
     {
         $stores = Store::query()->with(['storeItems.store', 'warehouse', 'owner'])->where('is_fast_stored', '无')->orderBy('id', 'DESC');

app/Services/TestService.php

@@ -3,9 +3,12 @@
 
 namespace App\Services;
 
+use App\Traits\ServiceAppAop;
+
 
 class TestService
 {
+    use ServiceAppAop;
     public function __construct()
     {
         dd(323333);

app/Services/UnitService.php

@@ -3,9 +3,12 @@
 namespace App\Services;
 
 use App\Unit;
+use App\Traits\ServiceAppAop;
+
 
 Class UnitService
 {
+    use ServiceAppAop;
     /*
      * array | string $column
      * 默认一些select字段,可传递string 或 array来指定select字段

app/Services/UserDutyCheckService.php

@@ -1,8 +1,11 @@
 <?php
 
 
-namespace App\Services;
+namespace App\Services;use App\Traits\ServiceAppAop;
+
+
 class UserDutyCheckService
 {
+    use ServiceAppAop;
 
 }

app/Services/UserOwnerGroupService.php

@@ -1,12 +1,15 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 
 use App\UserOwnerGroup;
+use App\Traits\ServiceAppAop;
+
 
 Class UserOwnerGroupService
 {
+    use ServiceAppAop;
     public function getSelection($column = ['id', 'name'])
     {
         return UserOwnerGroup::query()->select($column)->get();
@@ -41,4 +44,4 @@ Class UserOwnerGroupService
     {
         return UserOwnerGroup::destroy($id);
     }
-}
+}

app/Services/UserService.php

@@ -9,9 +9,12 @@ use App\Owner;
 use App\User;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Gate;
+use App\Traits\ServiceAppAop;
+
 
 class UserService
 {
+    use ServiceAppAop;
     /** @var CacheService $cacheService */
     private $cacheService;
     function __construct(){

app/Services/WarehouseService.php

@@ -8,13 +8,16 @@ use App\Warehouse;
 use Illuminate\Support\Collection;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Cache;
+use App\Traits\ServiceAppAop;
+
 
 Class WarehouseService
 {
+    use ServiceAppAop;
     /** @var CacheService $cacheService */
     private $cacheService;
     function __construct(){
-        $this->cacheService=app('CacheService');
+        $this->instant($this->cacheService,'CacheService');
     }
 
     public function firstOrCreate(array $params, array $values = null)

app/Services/WaveService.php

@@ -7,9 +7,12 @@ namespace App\Services;
 use App\OracleDOCWaveHeader;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use App\Traits\ServiceAppAop;
+
 
 class WaveService
 {
+    use ServiceAppAop;
     public function queryWave(Request $request)
     {
         $sql = $this->createSqlByCondition($request);

app/Services/WaybillFinancialService.php

@@ -1,12 +1,15 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\Services\common\QueryService;
 use App\WaybillFinancialSnapshot;
+use App\Traits\ServiceAppAop;
+
 
 Class WaybillFinancialService
 {
+    use ServiceAppAop;
     public function conditionQuery(array $param){
         $waybillFinancialSnapshots=WaybillFinancialSnapshot::query();
         $columnQueryRules=[
@@ -26,4 +29,4 @@ Class WaybillFinancialService
         return $this->conditionQuery($param)->sql();
     }
 
-}
+}

app/Services/WaybillPayoffService.php

@@ -1,13 +1,16 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\WaybillPayoff;
+use App\Traits\ServiceAppAop;
+
 
 Class WaybillPayoffService
-{ 
+{
+    use ServiceAppAop;
     public function updateOrCreate(array $waybillPayoffParam){
         return WaybillPayoff::query()->updateOrCreate(['waybill_id' => $waybillPayoffParam['waybill_id']],$waybillPayoffParam);
     }
 
-}
+}

app/Services/WaybillPriceModelService.php

@@ -1,13 +1,16 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\WaybillPriceModel;
+use App\Traits\ServiceAppAop;
+
 
 Class WaybillPriceModelService
-{ 
+{
+    use ServiceAppAop;
     public function find($id){
         return WaybillPriceModel::query()->find($id);
     }
 
-}
+}

app/Services/WaybillService.php

@@ -9,9 +9,12 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Ramsey\Uuid\Uuid;
+use App\Traits\ServiceAppAop;
+
 
 Class WaybillService
 {
+    use ServiceAppAop;
     /**
      * @param array $param
      * @return Builder

app/Services/WeighExceptedService.php

@@ -1,14 +1,17 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\OrderPackage;
 use App\Services\common\QueryService;
 use Illuminate\Database\Eloquent\Builder;
 
-const TABLE = "order_packages.";
+const TABLE = "order_packages.";use App\Traits\ServiceAppAop;
+
+
 Class WeighExceptedService
 {
+    use ServiceAppAop;
     /**
      * @param array $params
      * @return Builder
@@ -41,4 +44,4 @@ Class WeighExceptedService
                 ->selectRaw('logistics.name logistic_name')
             ->sql();
     }
-}
+}