Merge branch 'feature/article' into develop

app/console/service/BrandService.php

@@ -3,8 +3,11 @@
 namespace app\console\service;
 
 use app\console\model\BrandBannerModel;
+use app\console\model\BrandBannerTranslationModel;
 use app\console\model\BrandModel;
 use app\console\model\BrandTraitModel;
+use app\console\model\BrandTraitTranslationModel;
+use app\console\model\BrandTranslationModel;
 use app\mzl\common\services\BaseService;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
@@ -180,6 +183,14 @@ class BrandService extends BaseService
 //                $sourceFields
 //            );
 
+            BrandTranslationModel::updateOrCreate(
+                [
+                    'brand_id' => $id,
+                    'locale'    => $sourceLocale,
+                ],
+                $sourceFields
+            );
+
             //品牌轮播图
             $bannersId = [];
             foreach ($banners as $banner) {
@@ -210,6 +221,13 @@ class BrandService extends BaseService
 //                    $sourceLocale,
 //                    $bannersourceFields
 //                );
+                BrandBannerTranslationModel::updateOrCreate(
+                    [
+                        'banner_id' => $bannerId,
+                        'locale'    => $sourceLocale,
+                    ],
+                    $bannersourceFields
+                );
             }
             BrandBannerModel::whereNotIn('id', $bannersId)->where('brand_id',$id)->delete();
 
@@ -243,6 +261,14 @@ class BrandService extends BaseService
 //                    $sourceLocale,
 //                    $traitsourceFields
 //                );
+
+                BrandTraitTranslationModel::updateOrCreate(
+                    [
+                        'trait_id' => $traitId,
+                        'locale'    => $traitsourceFields,
+                    ],
+                    $bannersourceFields
+                );
             }
             BrandTraitModel::whereNotIn('id', $traitsId)->where('brand_id',$id)->delete();