From 9efc1f64ece5282f7eb2a144fa90235f899b0320 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 29 Aug 2019 09:57:39 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/store/controller/Config.php    |  1 -
 application/store/controller/Goods.php     | 20 +++++++++++++++++++-
 application/store/controller/GoodsCate.php | 16 ++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/application/store/controller/Config.php b/application/store/controller/Config.php
index 97acbb168..74d2ae888 100644
--- a/application/store/controller/Config.php
+++ b/application/store/controller/Config.php
@@ -15,7 +15,6 @@
 
 namespace app\store\controller;
 
-use app\store\service\Extend;
 use app\store\service\ExtendService;
 use library\Controller;
 
diff --git a/application/store/controller/Goods.php b/application/store/controller/Goods.php
index 2427bb7bd..d33ae32e4 100644
--- a/application/store/controller/Goods.php
+++ b/application/store/controller/Goods.php
@@ -105,6 +105,11 @@ class Goods extends Controller
     /**
      * 添加商品信息
      * @auth true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
      */
     public function add()
     {
@@ -116,6 +121,11 @@ class Goods extends Controller
     /**
      * 编辑商品信息
      * @auth true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
      */
     public function edit()
     {
@@ -136,13 +146,15 @@ class Goods extends Controller
     protected function _form_filter(&$data)
     {
         // 生成商品ID
-        if (empty($data['id'])) $data['id'] = Data::uniqidNumberCode(10);
+        if (empty($data['id'])) $data['id'] = Data::uniqidNumberCode(14);
         if ($this->request->isGet()) {
             $fields = 'goods_spec,goods_id,status,price_market market,price_selling selling,number_virtual `virtual`,number_express express';
             $defaultValues = Db::name('StoreGoodsList')->where(['goods_id' => $data['id']])->column($fields);
             $this->defaultValues = json_encode($defaultValues, JSON_UNESCAPED_UNICODE);
             $this->cates = Db::name('StoreGoodsCate')->where(['is_deleted' => '0', 'status' => '1'])->order('sort desc,id desc')->select();
         } elseif ($this->request->isPost()) {
+            if (empty($data['logo'])) $this->error('商品LOGO不能为空，请上传图片');
+            if (empty($data['image'])) $this->error('商品展示图片不能为空，请上传图片');
             Db::name('StoreGoodsList')->where(['goods_id' => $data['id']])->update(['status' => '0']);
             foreach (json_decode($data['lists'], true) as $vo) Data::save('StoreGoodsList', [
                 'goods_id'       => $data['id'],
@@ -170,6 +182,8 @@ class Goods extends Controller
     /**
      * 禁用商品信息
      * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
      */
     public function forbid()
     {
@@ -179,6 +193,8 @@ class Goods extends Controller
     /**
      * 启用商品信息
      * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
      */
     public function resume()
     {
@@ -188,6 +204,8 @@ class Goods extends Controller
     /**
      * 删除商品信息
      * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
      */
     public function remove()
     {
diff --git a/application/store/controller/GoodsCate.php b/application/store/controller/GoodsCate.php
index 42caf3af7..14d525aac 100644
--- a/application/store/controller/GoodsCate.php
+++ b/application/store/controller/GoodsCate.php
@@ -50,6 +50,11 @@ class GoodsCate extends Controller
     /**
      * 添加商品分类
      * @auth true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
      */
     public function add()
     {
@@ -60,6 +65,11 @@ class GoodsCate extends Controller
     /**
      * 编辑商品分类
      * @auth true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
      */
     public function edit()
     {
@@ -70,6 +80,8 @@ class GoodsCate extends Controller
     /**
      * 禁用商品分类
      * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
      */
     public function forbid()
     {
@@ -79,6 +91,8 @@ class GoodsCate extends Controller
     /**
      * 启用商品分类
      * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
      */
     public function resume()
     {
@@ -88,6 +102,8 @@ class GoodsCate extends Controller
     /**
      * 删除商品分类
      * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
      */
     public function remove()
     {