From ffe8739e7762c61d89717707c4c42405de6d1f32 Mon Sep 17 00:00:00 2001
From: linyaostalker <602604991@qq.com>
Date: Mon, 2 Dec 2019 11:41:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E8=A1=A8=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=A7=94=E9=9D=9E=E8=B4=9F=E6=95=B0=EF=BC=8C=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=AD=E5=A2=9E=E5=8A=A0=E7=9B=B8=E5=BA=94=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/controllers/AttributeController.php   |  2 +-
 .../src/controllers/CategoryController.php    |  4 +-
 ...column_sort_order_in_antgoods_category.php | 43 +++++++++++++++++++
 .../goods/src/models/ars/Category.php         | 16 +++++++
 4 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100644 vendor/antgoods/goods/src/migrations/m191202_032835_update_column_sort_order_in_antgoods_category.php

diff --git a/vendor/antgoods/goods/src/controllers/AttributeController.php b/vendor/antgoods/goods/src/controllers/AttributeController.php
index ffa0873..b406315 100644
--- a/vendor/antgoods/goods/src/controllers/AttributeController.php
+++ b/vendor/antgoods/goods/src/controllers/AttributeController.php
@@ -69,7 +69,7 @@ class AttributeController extends Controller
         $model->sort_order = 0;
         $model->cat_id = 0;
 
-        if ($model->load(Yii::$app->request->post())) {
+        if ($model->load(Yii::$app->request->post()) && $model->validate()) {
             $model->value = str_replace('，', ',', $model->value);
             $array = explode(',', $model->value);
             if (count($array) != count(array_unique($array))) {
diff --git a/vendor/antgoods/goods/src/controllers/CategoryController.php b/vendor/antgoods/goods/src/controllers/CategoryController.php
index fe0d783..7501f6e 100644
--- a/vendor/antgoods/goods/src/controllers/CategoryController.php
+++ b/vendor/antgoods/goods/src/controllers/CategoryController.php
@@ -82,7 +82,7 @@ class CategoryController extends Controller
         $model->is_show = Category::IS_SHOW_DISPLAY;
         $model->sort_order = 0;
 
-        if ($model->load(Yii::$app->request->post())) {
+        if ($model->load(Yii::$app->request->post()) && $model->validate()) {
 
             //类目图片上传保存处理
             $icon_image_id_str = $model->iconImageId;
@@ -115,7 +115,7 @@ class CategoryController extends Controller
         //记录已保存的类目图片id，用于修改
         $icon_image_old_id_arr = $model->icon;
 
-        if ($model->load(Yii::$app->request->post())) {
+        if ($model->load(Yii::$app->request->post()) && $model->validate()) {
 
             //类目图片上传保存处理
             $icon_image_id_str = $model->iconImageId;
diff --git a/vendor/antgoods/goods/src/migrations/m191202_032835_update_column_sort_order_in_antgoods_category.php b/vendor/antgoods/goods/src/migrations/m191202_032835_update_column_sort_order_in_antgoods_category.php
new file mode 100644
index 0000000..21aff0c
--- /dev/null
+++ b/vendor/antgoods/goods/src/migrations/m191202_032835_update_column_sort_order_in_antgoods_category.php
@@ -0,0 +1,43 @@
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Class m191202_032835_update_column_sort_order_in_antgoods_category
+ */
+class m191202_032835_update_column_sort_order_in_antgoods_category extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->dropColumn('antgoods_category', 'sort_order');
+        $this->addColumn('antgoods_category', 'sort_order', $this->smallInteger(3)->defaultValue(0)->comment('排序'));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        $this->dropColumn('antgoods_category', 'sort_order');
+        $this->addColumn('antgoods_category', 'sort_order', $this->smallInteger(3)->unsigned()->defaultValue(0)->comment('排序'));
+        return true;
+    }
+
+    /*
+    // Use up()/down() to run migration code without a transaction.
+    public function up()
+    {
+
+    }
+
+    public function down()
+    {
+        echo "m191202_032835_update_column_sort_order_in_antgoods_category cannot be reverted.\n";
+
+        return false;
+    }
+    */
+}
diff --git a/vendor/antgoods/goods/src/models/ars/Category.php b/vendor/antgoods/goods/src/models/ars/Category.php
index a919057..e9ff057 100644
--- a/vendor/antgoods/goods/src/models/ars/Category.php
+++ b/vendor/antgoods/goods/src/models/ars/Category.php
@@ -54,9 +54,25 @@ class Category extends \yii\db\ActiveRecord
             [['pid', 'goods_count', 'sort_order', 'is_show', 'is_delete', 'icon'], 'integer'],
             [['name'], 'string', 'max' => 60],
             [['iconImageId'], 'string'],
+            [['sort_order'], 'checkNegative'],
         ];
     }
 
+    /**
+     * @param $attribute
+     * @param $params
+     * 验证是否为负数
+     */
+    public function checkNegative($attribute, $params)
+    {
+        if ($this->$attribute < 0) {
+            $this->addError($attribute, "不得为负数");
+        }
+        if ($this->$attribute > 65535) {
+            $this->addError($attribute, "不得大于65535");
+        }
+    }
+
     /**
      * {@inheritdoc}
      */