增加英文支持

app/Models/Cart.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Base\BaseModel;
+use App\Models\Goods\Goods;
 use Illuminate\Support\Arr;
 
 /**
@@ -31,6 +32,7 @@ use Illuminate\Support\Arr;
  * @property-read mixed                      $sn
  * @property-read mixed                      $custom
  * @property-read mixed                      $sku_id
+ * @property-read Goods|null                 $goods
  */
 class Cart extends BaseModel
 {
@@ -65,4 +67,9 @@ class Cart extends BaseModel
     {
         return Arr::get($this->extra, "custom", []);
     }
+
+    public function goods()
+    {
+        return $this->belongsTo(Goods::class);
+    }
 }

app/Modules/Mini/Services/CartService.php

@@ -21,7 +21,8 @@ class CartService extends BaseService
                 return [
                     "id" => $model->id,
                     "sn" => $model->sn,
-                    "name" => $model->goods_name,
+                    "name" => $model->goods->name,
+                    "en_name" => $model->goods->en_name,
                     "thumb" => $model->thumb,
                     "count" => $model->count,
                     "custom" => $model->custom,

app/Modules/Mini/Services/GoodsService.php

@@ -28,9 +28,13 @@ class GoodsService extends BaseService
         return [
             "id" => $goods->id,
             "name" => $goods->name,
+            "en_name" => $goods->en_name,
             "category_name" => $gmap->where("is_public", 1)->map(function (GoodsCategoryMap $map) {
                 return optional($map->category)->name;
             })->implode("/"),
+            "en_category_name" => $gmap->where("is_public", 1)->map(function (GoodsCategoryMap $map) {
+                return optional($map->category)->en_name;
+            })->implode("/"),
             "image_list" => $goods->image_list,
             "spec" => array_map(function ($specId) {
                 try {
@@ -39,6 +43,7 @@ class GoodsService extends BaseService
                     return [
                         "id" => $spec->id,
                         "name" => $spec->name,
+                        "en_name" => $spec->en_name,
                         "is_custom" => $spec->is_custom,
                         "attr" => $spec->attrs->map(function (SpecAttr $a) {
                             return [
@@ -63,6 +68,7 @@ class GoodsService extends BaseService
                     "spec_id" => $m->spec_id,
                     "value" => $m->value,
                     "name" => $m->spec->name,
+                    "en_name" => $m->spec->en_name,
                 ];
             }),
             "custom" => $goods->custom,

app/Modules/Mini/Services/OrderService.php

@@ -105,6 +105,7 @@ class OrderService extends BaseService
                         return [
                             "goods_id" => $goods->id,
                             "goods_name" => $goods->goods->name,
+                            "goods_en_name" => $goods->goods->en_name,
                             "goods_thumb" => $goods->goods->thumb,
                             "goods_sn" => $goods->sn,
                             "goods_count" => $goods->count,

app/Modules/Mini/Services/PageService.php

@@ -44,6 +44,7 @@ class PageService extends BaseService
             return [
                 "id" => $category->id,
                 "name" => $category->name,
+                "en_name" => $category->en_name,
                 "thumb" => $category->thumb,
                 "child" => $this->childTree($category),
             ];
@@ -60,6 +61,7 @@ class PageService extends BaseService
             return [
                 "id" => $category->id,
                 "name" => $category->name,
+                "en_name" => $category->en_name,
                 "thumb" => $category->thumb,
                 "child" => $this->childTree($category),
             ];
@@ -74,6 +76,7 @@ class PageService extends BaseService
             return [
                 "id" => $g->id,
                 "name" => $g->name,
+                "en_name" => $g->en_name,
                 "thumb" => $g->thumb,
                 "view_total" => $g->view_total,
             ];
@@ -88,6 +91,7 @@ class PageService extends BaseService
             return [
                 "id" => $g->id,
                 "name" => $g->name,
+                "en_name" => $g->en_name,
                 "thumb" => $g->thumb,
             ];
         });
@@ -114,6 +118,7 @@ class PageService extends BaseService
             return [
                 "id" => $model->id,
                 "name" => $model->name,
+                "en_name" => $model->en_name,
                 "type" => "attr",
                 "child" => $model->attrs->map(function (SpecAttr $attr) {
                     return [
@@ -161,6 +166,7 @@ class PageService extends BaseService
                 return [
                     "id" => $model->id,
                     "name" => $model->name,
+                    "en_name" => $model->en_name,
                     "thumb" => $model->thumb,
                     "weight" => $model->weight,
                 ];
@@ -169,6 +175,7 @@ class PageService extends BaseService
                 return ["id" => $model->id,
                     "thumb" => $model->thumb,
                     "name" => $model->name,
+                    "en_name" => $model->en_name,
                 ];
             }),
         ];
@@ -207,6 +214,7 @@ class PageService extends BaseService
                 return [
                     "id" => $model->id,
                     "name" => $model->name,
+                    "en_name" => $model->en_name,
                     "thumb" => $model->thumb,
                     "weight" => $model->weight,
                 ];