From 20279ee44c9efdac1447d3ae8b9fb56694d6f761 Mon Sep 17 00:00:00 2001 From: Lemon <15040771@qq.com> Date: Mon, 28 Sep 2020 16:17:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Constants/v3/LogLabel.php | 10 ++++ app/Controller/v3/GoodsController.php | 40 ++++++++++++++- app/Request/v3/GoodsEditorRequest.php | 2 - .../v3/Implementations/GoodsService.php | 50 +++++++++++++++++++ 4 files changed, 98 insertions(+), 4 deletions(-) diff --git a/app/Constants/v3/LogLabel.php b/app/Constants/v3/LogLabel.php index 7163136..4af7e3f 100644 --- a/app/Constants/v3/LogLabel.php +++ b/app/Constants/v3/LogLabel.php @@ -112,4 +112,14 @@ class LogLabel extends AbstractConstants */ const ORDER_AUTO_CANCEL_FAIL_LOG = 'order_auto_cancel_fail_log'; + /** + * @Message("创建商品记录") + */ + const CREATE_GOODS_LOG = 'create_goods_log'; + + /** + * @Message("更新商品记录") + */ + const UPDATE_GOODS_LOG = 'update_goods_log'; + } diff --git a/app/Controller/v3/GoodsController.php b/app/Controller/v3/GoodsController.php index 71b055c..05cefba 100644 --- a/app/Controller/v3/GoodsController.php +++ b/app/Controller/v3/GoodsController.php @@ -90,7 +90,25 @@ class GoodsController extends BaseController public function update(GoodsEditorRequest $request) { - $res = $this->goodsService->update($this->request->all()); + $data['id'] = $this->request->input('id',0); + $data['market_id'] = $this->request->input('market_id',0); + $data['store_id'] = $this->request->input('store_id',0); + $data['name'] = $this->request->input('name',''); + $data['category_id'] = $this->request->input('category_id',0); + $data['goods_category_id'] = $this->request->input('goods_category_id',0); + $data['goods_unit'] = $this->request->input('goods_unit',''); + $data['price'] = $this->request->input('price',0); + $data['original_price'] = $this->request->input('original_price',0); + $data['inventory'] = $this->request->input('inventory',0); + $data['restrict_num'] = $this->request->input('restrict_num',0); + $data['start_num'] = $this->request->input('start_num',0); + $data['spec'] = $this->request->input('spec',[]); + $data['tags'] = $this->request->input('tags',[]); + $data['remark'] = $this->request->input('remark',''); + $data['on_sale'] = $this->request->input('on_sale',0); + $data['is_infinite'] = $this->request->input('is_infinite',0); + $data['user_id'] = $this->request->input('user_id',0); + $res = $this->goodsService->update($data); return $this->success($res); } @@ -120,7 +138,25 @@ class GoodsController extends BaseController public function create(GoodsEditorRequest $request) { - $res = $this->goodsService->create($this->request->all()); + $data['id'] = $this->request->input('id',0); + $data['market_id'] = $this->request->input('market_id',0); + $data['store_id'] = $this->request->input('store_id',0); + $data['name'] = $this->request->input('name',''); + $data['category_id'] = $this->request->input('category_id',0); + $data['goods_category_id'] = $this->request->input('goods_category_id',0); + $data['goods_unit'] = $this->request->input('goods_unit',''); + $data['price'] = $this->request->input('price',0); + $data['original_price'] = $this->request->input('original_price',0); + $data['inventory'] = $this->request->input('inventory',0); + $data['restrict_num'] = $this->request->input('restrict_num',0); + $data['start_num'] = $this->request->input('start_num',0); + $data['spec'] = $this->request->input('spec',[]); + $data['tags'] = $this->request->input('tags',[]); + $data['remark'] = $this->request->input('remark',''); + $data['on_sale'] = $this->request->input('on_sale',0); + $data['is_infinite'] = $this->request->input('is_infinite',0); + $data['user_id'] = $this->request->input('user_id',0); + $res = $this->goodsService->create($data); return $this->success($res); } diff --git a/app/Request/v3/GoodsEditorRequest.php b/app/Request/v3/GoodsEditorRequest.php index fc2bf44..ee977c4 100644 --- a/app/Request/v3/GoodsEditorRequest.php +++ b/app/Request/v3/GoodsEditorRequest.php @@ -23,8 +23,6 @@ class GoodsEditorRequest extends BaseFormRequest 'price' => 'required|nonempty', 'is_infinite' => 'required', 'inventory' => 'required', - 'restrict_num' => 'required', - 'start_num' => 'required', 'on_sale' => 'required', ]; } diff --git a/app/Service/v3/Implementations/GoodsService.php b/app/Service/v3/Implementations/GoodsService.php index 990a07c..ca33e27 100644 --- a/app/Service/v3/Implementations/GoodsService.php +++ b/app/Service/v3/Implementations/GoodsService.php @@ -2,7 +2,9 @@ namespace App\Service\v3\Implementations; +use App\Commons\Log; use App\Constants\v3\ErrorCode; +use App\Constants\v3\LogLabel; use App\Exception\ErrorCodeException; use App\Service\v3\Interfaces\GoodsServiceInterface; use Hyperf\DbConnection\Db; @@ -12,9 +14,15 @@ use App\Constants\v3\Store; use App\Constants\v3\goods as goodsConstants; use Hyperf\Redis\Redis; use Hyperf\Utils\ApplicationContext; +use Hyperf\Di\Annotation\Inject; class GoodsService implements GoodsServiceInterface { + /** + * @Inject + * @var Log + */ + protected $log; public function do($goodsId) { @@ -97,6 +105,27 @@ class GoodsService implements GoodsServiceInterface 'on_sale' => $params['on_sale'], 'is_infinite' => $params['is_infinite'] ]; + $this->log->event(LogLabel::CREATE_GOODS_LOG, ['logData' => json_encode( + [ + 'id' => $params['id'], + 'market_id' => $params['market_id'], + 'store_id' => $params['store_id'], + 'name' => $params['name'], + 'category_id' => $params['category_id'], + 'goods_category_id' => $params['goods_category_id'], + 'goods_unit' => $params['goods_unit'], + 'price' => $params['price'], + 'original_price' => $params['original_price'], + 'inventory' => $params['inventory'], + 'restrict_num' => $params['restrict_num'], + 'start_num' => $params['start_num'], + 'spec' => $params['spec'], + 'tags' => $params['tags'], + 'remark' => $params['remark'], + 'on_sale' => $params['on_sale'], + 'is_infinite' => $params['is_infinite'] + ] + )]); return Goods::create($data); } @@ -127,6 +156,27 @@ class GoodsService implements GoodsServiceInterface 'on_sale' => $params['on_sale'], 'is_infinite' => $params['is_infinite'] ]); + $this->log->event(LogLabel::UPDATE_GOODS_LOG, ['logData' => json_encode( + [ + 'id' => $params['id'], + 'market_id' => $params['market_id'], + 'store_id' => $params['store_id'], + 'name' => $params['name'], + 'category_id' => $params['category_id'], + 'goods_category_id' => $params['goods_category_id'], + 'goods_unit' => $params['goods_unit'], + 'price' => $params['price'], + 'original_price' => $params['original_price'], + 'inventory' => $params['inventory'], + 'restrict_num' => $params['restrict_num'], + 'start_num' => $params['start_num'], + 'spec' => $params['spec'], + 'tags' => $params['tags'], + 'remark' => $params['remark'], + 'on_sale' => $params['on_sale'], + 'is_infinite' => $params['is_infinite'] + ] + )]); return $goods; }