Browse Source

增加英文支持

kphcdr 1 year ago
parent
commit
875f887efc

+ 8 - 0
app/Models/User/UserCompany.php

@@ -25,6 +25,14 @@ use App\Base\BaseModel;
  * @method static \Illuminate\Database\Eloquent\Builder|UserCompany whereTaxNo($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserCompany whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserCompany whereUserId($value)
+ * @property string                          $department
+ * @property string                          $tel
+ * @property string                          $address
+ * @property string                          $linkman 联系人名称
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCompany whereAddress($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCompany whereDepartment($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCompany whereLinkman($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserCompany whereTel($value)
  */
 class UserCompany extends BaseModel
 {

+ 6 - 2
app/Modules/Mini/Controllers/UserController.php

@@ -8,7 +8,6 @@ use App\Models\User\UserFav;
 use App\Modules\Mini\Services\AddressService;
 use App\Modules\Mini\Services\CompanyService;
 use App\Modules\Mini\Services\FavService;
-use Faker\Provider\Image;
 use Illuminate\Support\Facades\Auth;
 
 class UserController extends BaseController
@@ -17,7 +16,12 @@ class UserController extends BaseController
     {
         $params = $this->valid([
             "name" => "required",
-            "tax_no" => "required",
+            "tax_no" => "",
+            "department" => "",
+            "tel" => "",
+            "address" => "",
+            "linkman" => "",
+
         ]);
 
         return $this->ok(app(CompanyService::class)->company(Auth::user(), $params));

+ 8 - 9
app/Modules/Mini/Services/CompanyService.php

@@ -3,7 +3,6 @@
 namespace App\Modules\Mini\Services;
 
 use App\Base\BaseService;
-use App\Exceptions\ClientException;
 use App\Models\User\User;
 use App\Models\User\UserCompany;
 
@@ -12,14 +11,14 @@ class CompanyService extends BaseService
     public function company(User $user, $params)
     {
         if ($user->company) {
-            if ($user->company->status == UserCompany::STATUS_INIT) {
-                throw new ClientException("已经提交过资料了");
-            } else {
-                $user->company->name = $params['name'];
-                $user->company->tax_no = $params['tax_no'];
-                $user->company->status = 1;
-                $user->company->save();
-            }
+//            if ($user->company->status == UserCompany::STATUS_INIT) {
+//                throw new ClientException("已经提交过资料了");
+//            } else {
+            $user->company->name = $params['name'];
+            $user->company->tax_no = $params['tax_no'];
+            $user->company->status = 1;
+            $user->company->save();
+//            }
             return $user->company;
         } else {
 

+ 37 - 0
database/migrations/2023_05_29_142353_alert_company_fidle.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table("user_company", function (Blueprint $t) {
+            $t->string("department")->default("");
+            $t->string("tel")->default("");
+            $t->string("address")->default("");
+            $t->string("linkman")->default("")->comment("联系人名称");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table("user_company", function (Blueprint $t) {
+            $t->dropColumn("department");
+            $t->dropColumn("tel");
+            $t->dropColumn("address");
+            $t->dropColumn("linkman");
+        });
+    }
+};