帖子关联商品
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
namespace app\admin\controller;
|
||||
|
||||
use app\common\controller\BaseController;
|
||||
use app\common\service\OssService;
|
||||
use app\common\traits\crud\CrudControllerTrait;
|
||||
use app\common\service\SkuService;
|
||||
use support\Request;
|
||||
@@ -30,7 +31,7 @@ class SkuController extends BaseController
|
||||
$res = $this->service->serviceStore($request, $data);
|
||||
return $this->success($res, '创建成功');
|
||||
} catch (\Throwable $e) {
|
||||
return $this->error($e->getMessage().$e->getFile().$e->getLine());
|
||||
return $this->error($e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,6 +49,15 @@ class SkuController extends BaseController
|
||||
$data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
|
||||
if (isset($data['spec_json']))
|
||||
$data['spec'] = json_decode($data['spec_json'], true);
|
||||
$ossservice = new OssService();
|
||||
if (isset($data['image'])){
|
||||
$data['image'] = explode(',',$data['image']);
|
||||
foreach ($data['image'] as $key => $image){
|
||||
$data['image_pull'][$key] = $ossservice->generatePrivateUrl($image);
|
||||
}
|
||||
}
|
||||
if (isset($data['main_image']))
|
||||
$data['main_image_pull'] = $ossservice->generatePrivateUrl($data['main_image']);
|
||||
return $data;
|
||||
}
|
||||
}
|
||||
@@ -104,6 +104,16 @@ class PostController extends BaseController
|
||||
if($sku){
|
||||
$sku['main_image_pull'] = $ossservice->generatePrivateUrl($sku['main_image']);
|
||||
}
|
||||
|
||||
if (!empty($sku['image'])){
|
||||
$sku['image'] = explode(',',$sku['image']);
|
||||
foreach ($sku['image'] as $key => $image){
|
||||
$sku['image_pull'][$key] = $ossservice->generatePrivateUrl($image);
|
||||
}
|
||||
}
|
||||
if (isset($sku['spec_json']))
|
||||
$sku['spec'] = json_decode($sku['spec_json'], true);
|
||||
|
||||
$data['sku'] = $sku;
|
||||
}
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ class Post extends Model
|
||||
/**
|
||||
* 允许自动填充模型字段
|
||||
*/
|
||||
protected $fillable = ['id', 'user_id', 'category_id', 'sku_id', 'content', 'location_name', 'latitude', 'longitude', 'status', 'sort', 'like', 'favorite', 'comment', 'browse', 'created_at', 'updated_at'];
|
||||
protected $fillable = ['id', 'user_id', 'category_id', 'sku_id', 'content', 'location_name', 'latitude', 'longitude', 'status', 'sort', 'like', 'favorite', 'comment', 'browse', 'created_at', 'updated_at', 'price', 'age'];
|
||||
|
||||
/**
|
||||
* 不允许自动填充模型字段
|
||||
|
||||
@@ -45,5 +45,5 @@ class Sku extends Model
|
||||
/**
|
||||
* 不允许自动填充模型字段
|
||||
*/
|
||||
protected $guarded = [];
|
||||
protected $guarded = ['updated_at'];
|
||||
}
|
||||
@@ -71,7 +71,6 @@ class PostService
|
||||
$config['where']['content'] = ['like', '%'.$p['keyword'].'%'];
|
||||
}
|
||||
$config['where']['status'] = 1;
|
||||
$config['order']['sort'] = 'desc';
|
||||
|
||||
if (isset($p['favorite']) && $p['favorite']) {
|
||||
$config['order']['favorite'] = 'desc';
|
||||
|
||||
@@ -54,10 +54,11 @@ class SkuService
|
||||
$data['spec_json'] = $spec_json;
|
||||
$data['user_id'] = $request->user->uid;
|
||||
$data['code'] = $this->generateUniqueCode();
|
||||
$data['image'] = implode(',',$data['image']);
|
||||
|
||||
// 将OSS直连地址替换为代理地址
|
||||
$ossDomain = 'https://vehicle-album.oss-cn-beijing.aliyuncs.com/';
|
||||
$proxyPath = '/console/upload/image/proxy?file=';
|
||||
$proxyPath = '/proxy/ossurl?file=';
|
||||
|
||||
$data['desc'] = str_replace(
|
||||
'?Expires=',
|
||||
@@ -69,6 +70,14 @@ class SkuService
|
||||
$proxyPath,
|
||||
$data['desc']
|
||||
);
|
||||
// 将OSS直连地址替换为代理地址
|
||||
$ossDomain = 'https://oss-cn-beijing.aliyuncs.com/';
|
||||
$proxyPath = '/proxy/ossurl?file=';
|
||||
$data['desc'] = str_replace(
|
||||
$ossDomain,
|
||||
$proxyPath,
|
||||
$data['desc']
|
||||
);
|
||||
|
||||
return $data;
|
||||
}
|
||||
|
||||
@@ -27,25 +27,25 @@ class IndexController
|
||||
$options = [
|
||||
'controller' => [
|
||||
'module' => 'common',
|
||||
'name' => 'sku_attribute_value'
|
||||
'name' => 'barrage'
|
||||
],
|
||||
'model' => [
|
||||
'module' => 'common',
|
||||
'name' => 'sku_attribute_value'
|
||||
'name' => 'barrage'
|
||||
],
|
||||
'service' => [
|
||||
'module' => 'common',
|
||||
'name' => 'sku_attribute_value'
|
||||
'name' => 'barrage'
|
||||
],
|
||||
'logic' => [
|
||||
'module' => 'common',
|
||||
'name' => 'sku_attribute_value'
|
||||
'name' => 'barrage'
|
||||
],
|
||||
'validate' => [
|
||||
'module' => 'common',
|
||||
'name' => 'sku_attribute_value'
|
||||
'name' => 'barrage'
|
||||
],
|
||||
'table' => 'sku_attribute_value'
|
||||
'table' => 'barrage'
|
||||
];
|
||||
|
||||
$result = (new Generate($options))->doGenerate();
|
||||
|
||||
Reference in New Issue
Block a user