Преглед на файлове

数据纠正与连接多开

Zhouzhendong преди 4 години
родител
ревизия
c266b680e3

+ 1 - 1
app/Console/Commands/LogExpireDelete.php

@@ -46,7 +46,7 @@ class LogExpireDelete extends Command
     public function deleteLog(){
         $expire_duration=config('logging.expire_duration');//保留的日志天数
         $date=Carbon::now()->subDays($expire_duration)->format('Y-m-d');
-        DB::table('logs')->where('created_at','<',$date)->delete();
+        DB::connection("mysql3306")->table('logs')->where('created_at','<',$date)->delete();
         DB::statement('OPTIMIZE TABLE logs');
     }
 }

+ 31 - 0
app/Http/Controllers/TestController.php

@@ -62,6 +62,10 @@ use App\Services\AuthorityService;
 use App\Services\BatchService;
 use App\Services\CacheShelfService;
 use App\Services\ForeignHaiRoboticsService;
+use App\Services\LogisticSFService;
+use App\Services\LogisticYDService;
+use App\Services\LogisticYTOService;
+use App\Services\LogisticZopService;
 use App\Services\NotificationService;
 use App\Services\OracleDOCOrderHeaderService;
 use App\Services\OrderPackageCommoditiesService;
@@ -210,6 +214,33 @@ class TestController extends Controller
     }
     public function test(Request $request)
     {
+        dd(User::query()->first());
+        $a1 = new LogisticZopService();
+        dd($a1->query("75817473355088"));
+        ini_set('max_execution_time',2500);
+        $packages = OrderPackage::query()->select("logistic_number")->where("collecting_status",1)
+            ->where("updated_at",">=","2021-10-18 22:10:00")
+            ->where("updated_at","<=","2021-10-19 12:00:00")
+            ->get();
+        $a1 = new LogisticZopService();
+        $err = [];
+        $arr = [];
+        foreach ($packages as $package){
+            $r = $a1->query($package->logistic_number);
+            if (!$r->status)$err[] = $package->logistic_number;
+            else{
+                $sign = 0;
+                $c = [];
+                foreach ($r->result as $item){
+                    if (mb_strpos($item->desc,"宝时物流")!==false
+                    )$sign++;
+                    $c[] = $item->desc;
+                }
+                dump($c);
+                if ($sign>1)$arr[] = $package->logistic_number;
+            }
+        }
+        dd($arr,$err);
         $b = new StorageTypeController();
         $name = "test";
         $tag = "tag_name";

+ 1 - 0
app/Log.php

@@ -12,6 +12,7 @@ use App\Traits\ModelLogChanging;
 class Log extends Model
 {
     use ModelTimeFormat;
+    protected $connection="mysql3306";
     protected $fillable = [
          'description','type','method', 'class', 'ip','id_user','created_at','updated_at'
     ];

+ 1 - 0
app/Order.php

@@ -12,6 +12,7 @@ class Order extends Model
     use ModelLogChanging;
     use ModelTimeFormat;
 
+    protected $connection="mysql3306";
     protected $fillable = [
         'id',
         'batch_id',

+ 1 - 0
app/OrderCommodity.php

@@ -11,6 +11,7 @@ class OrderCommodity extends Model
 {
     use ModelLogChanging;
 
+    protected $connection="mysql3306";
     protected $fillable = [
         'id', 'order_id','commodity_id', 'amount','wms_ptltaskid','location'
     ];

+ 1 - 0
app/OrderPackage.php

@@ -20,6 +20,7 @@ class OrderPackage extends Model
 
     use ModelTimeFormat;
 
+    protected $connection="mysql3306";
     protected $fillable = [
         'order_id',
         'logistic_number',

+ 1 - 0
app/OrderPackageCommodities.php

@@ -20,6 +20,7 @@ class OrderPackageCommodities extends Model
     /*
      * amount => OracleActAllocationDetails->qty_each
      */
+    protected $connection="mysql3306";
     protected $fillable = [
         'order_package_id','commodity_id','amount'
     ];

+ 1 - 0
app/OwnerFeeDetail.php

@@ -13,6 +13,7 @@ class OwnerFeeDetail extends Model
 {
 //    use ModelLogChanging;
 
+    protected $connection="mysql3306";
     protected $fillable = [
         "owner_id",         //货主ID
         "worked_at",        //作业时间

+ 4 - 3
app/Services/BatchService.php

@@ -17,6 +17,7 @@ use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Http;
 use App\Traits\ServiceAppAop;
+use Illuminate\Support\Facades\Log;
 
 
 class BatchService
@@ -99,11 +100,11 @@ class BatchService
         }catch(Exception $e){
             $batchesJson='';
             foreach ($batches as $batch){
-                $batchesJson.=json_encode($batch);
+                $batchesJson.=json_encode($batch->code);
                 Cache::tags(['波次防重叠'.$batch['id']])->flush();
             }
-            app('LogService')->log('海柔','注册任务失败',$e->getMessage()." | ".json_encode($batches));
-            throw new ErrorException('注册任务失败: '. $batchesJson . $e->getMessage().json_encode($e->getTrace()));
+            Log::error("注册任务失败",["msg"=>$e->getMessage(),"json"=>$batchesJson]);
+            throw new Exception('注册任务失败: '. $batchesJson);
         }
     }
 

+ 1 - 1
app/Services/OrderCommodityService.php

@@ -49,7 +49,7 @@ class OrderCommodityService
         return $orderCommodities;
     }
     public function batchUpdate($updateParams){
-        return app(BatchUpdateService::class)->batchUpdate('order_commodities',$updateParams);
+        return app(BatchUpdateService::class)->batchUpdate('order_commodities',$updateParams,"mysql3306");
     }
 
     public function syncOrderCommodity(&$orderHeaders)

+ 2 - 2
app/Services/OrderPackageCommoditiesService.php

@@ -26,7 +26,7 @@ class OrderPackageCommoditiesService
     protected $modelClass=OrderPackageCommodities::class;
 
     public function batchUpdate($params){
-        return app(BatchUpdateService::class)->batchUpdate('order_package_commodities',$params);
+        return app(BatchUpdateService::class)->batchUpdate('order_package_commodities',$params,"mysql3306");
     }
 
     public function create(array $params){
@@ -60,7 +60,7 @@ class OrderPackageCommoditiesService
 
     public function batchUpdateItself($column, array $params)
     {
-        return app(BatchUpdateService::class)->batchUpdateItself('order_package_commodities', $column, $params);
+        return app(BatchUpdateService::class)->batchUpdateItself('order_package_commodities', $column, $params,"mysql3306");
     }
 
     public function getByOrderNos($orderNos)

+ 2 - 2
app/Services/OrderPackageExceptionTypeCountingRecordService.php

@@ -19,7 +19,7 @@ class OrderPackageExceptionTypeCountingRecordService
      */
     public function updateOrCreate($days)
     {
-        DB::table("order_packages")
+        DB::connection("mysql3306")->table("order_packages")
             ->select(['exception_type',
                 DB::raw('count( * ) AS exception_type_count'),
                 DB::raw("DATE_FORMAT( sent_at, '%Y-%m-%d' ) AS sent_at_date "),
@@ -39,7 +39,7 @@ class OrderPackageExceptionTypeCountingRecordService
 
     public function updateOrCreateByDate($date)
     {
-        DB::table("order_packages")
+        DB::connection("mysql3306")->table("order_packages")
             ->select(['exception_type',
                 DB::raw('count( * ) AS exception_type_count'),
                 DB::raw("DATE_FORMAT( sent_at, '%Y-%m-%d' ) AS sent_at_date "),

+ 1 - 1
app/Services/OrderPackageService.php

@@ -31,7 +31,7 @@ class OrderPackageService
 
     public function batchUpdate(array $params)
     {
-        return app(BatchUpdateService::class)->batchUpdate('order_packages', $params);
+        return app(BatchUpdateService::class)->batchUpdate('order_packages', $params,"mysql3306");
     }
 
     /** @var OrderTrackingService $orderTrackingService */

+ 1 - 1
app/Services/OrderService.php

@@ -66,7 +66,7 @@ class OrderService
 
     public function batchUpdate($params)
     {
-        return app(BatchUpdateService::class)->batchUpdate('orders', $params);
+        return app(BatchUpdateService::class)->batchUpdate('orders', $params,"mysql3306");
     }
 
 

+ 1 - 1
app/Services/PackageStatisticsService.php

@@ -19,7 +19,7 @@ class PackageStatisticsService
      */
     private function conditionQuery(array $params){
         $ownerIds = app('UserService')->getPermittingOwnerIds(auth()->user());
-        $query = DB::table('order_packages')->select(DB::raw('COUNT(*) AS count'))
+        $query = DB::connection("mysql3306")->table('order_packages')->select(DB::raw('COUNT(*) AS count'))
             ->whereIn('order_packages.owner_id',$ownerIds)
             ->whereNotNull('logistic_id')
             ->leftJoin('orders','order_packages.order_id','orders.id')

+ 1 - 0
app/StoreItem.php

@@ -12,6 +12,7 @@ class StoreItem extends Model
     use ModelLogChanging;
 
     use ModelTimeFormat;
+    protected $connection="mysql3306";
     protected $fillable=[
         'store_id','asn_line_code','name',
         'sku','barcode','depository_id','amount','quality','status','commodity_id','expected_amount'

+ 20 - 0
config/database.php

@@ -43,6 +43,26 @@ return [
             'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
         ],
 
+        'mysql3306' => [
+            'driver' => 'mysql',
+            'url' => env('DATABASE_URL'),
+            'host' => env('DB_HOST', '127.0.0.1'),
+            'port' => '3306',
+            'database' => env('DB_DATABASE', 'forge'),
+            'username' => env('DB_USERNAME', 'forge'),
+            'password' => env('DB_PASSWORD', ''),
+            'unix_socket' => env('DB_SOCKET', ''),
+            'charset' => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
+            'prefix' => '',
+            'prefix_indexes' => true,
+            'strict' => false,
+            'engine' => null,
+            'options' => extension_loaded('pdo_mysql') ? array_filter([
+                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+            ]) : [],
+        ],
+
         'mysql' => [
             'driver' => 'mysql',
             'url' => env('DATABASE_URL'),