Merge branch 'master' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Services/OrderPackageReceivedSyncService.php

@@ -150,6 +150,7 @@ class OrderPackageReceivedSyncService
      */
     public function update(array $logisticResponses)
     {
+
         foreach ($logisticResponses as $logisticResponse) {
             if (empty($logisticResponse)) continue;
             $orderPackage = OrderPackage::query()->where('logistic_number', $logisticResponse['logistic_number'])->first();
@@ -196,7 +197,6 @@ class OrderPackageReceivedSyncService
             }
             /** @var OrderPackage $orderPackage */
             $orderPackage = OrderPackage::query()->where('logistic_number', $logisticResponse['logistic_number'])->first();
-            $orderPackage->update($logisticResponse);
             if (isset($logisticResponse['transfer_status']) && isset($logisticResponse['logistic_number'])) {
                 $orderPackageExpressRoute = OrderPackageExpressRoute::query()->updateOrCreate(
                     [
@@ -209,7 +209,8 @@ class OrderPackageReceivedSyncService
                 $orderPackage->order_package_express_route_id = $orderPackageExpressRoute->id;
                 $orderPackage->save();
             }
-            $orderPackage->save();
+            unset($logisticResponse['transfer_status']);
+            OrderPackage::query()->where('logistic_number', $logisticResponse['logistic_number'])->update($logisticResponse);
         }
     }
 

database/migrations/2021_12_16_155027_add_colum_empno_to_users_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddColumEmpnoToUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('empno')->nullable()->unique()->comment('工号');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('empno');
+        });
+    }
+}