Merge branch 'development' of http://gitlab-ebiz.yiyao365.cn/newshop/newshopback into development

backend/controllers/v1/authority/AuthorityNodeController.php

@@ -78,6 +78,7 @@ class AuthorityNodeController extends BaseController
      *                  ID:节点id,
      *                  NAME:菜单地址,
      *                  TITLE:菜单名称,
+     *                  ICON:菜单前面的图标,
      *                  STATUS:菜单状态 0禁用 1启用,
      *                  IS_MENU:是否为菜单（1：是，0：不是）,
      *                  IS_TOP_MENU:是否顶部菜单 1是 0否,
@@ -127,7 +128,7 @@ class AuthorityNodeController extends BaseController
      *                 required={"TITLE","SORT","LEVEL"},
      *                 @OA\Property(property="NAME" ,type="string", description="菜单地址"),
      *                 @OA\Property(property="TITLE" ,type="string", description="菜单名称"),
-     *                 @OA\Property(property="LOGO" ,type="string",description="菜单前面的图标url"),
+     *                 @OA\Property(property="ICON" ,type="string",description="菜单前面的图标"),
      *                 @OA\Property(property="STATUS", type="int",description="菜单状态(默认1启用，0禁用)",example="1"),
      *                 @OA\Property(property="IS_MENU", type="int",description="是否菜单(默认0否，1是)",example="0"),
      *                 @OA\Property(property="IS_TOP_MENU", type="int",description="是否顶部菜单(默认0否，1是)",example="0"),
@@ -228,7 +229,7 @@ class AuthorityNodeController extends BaseController
      *                  ID:节点id,
      *                  NAME:菜单地址,
      *                  TITLE:菜单名称,
-     *                  LOGO:logo地址,
+     *                  ICON:图标,
      *                  STATUS:菜单状态 0禁用 1启用,
      *                  IS_MENU:是否为菜单（1：是，0：不是）,
      *                  IS_TOP_MENU:是否顶部菜单 1是 0否,
@@ -236,7 +237,7 @@ class AuthorityNodeController extends BaseController
      *                  REMARK:描述,
      *                  SORT:菜单排序序号,
      *                  PID:父级菜单ID,
-     *                  LEVEL:菜单层级等级(类型-0:项目,1:模块,2:操作,3:动作)")
+     *                  LEVEL:菜单层级等级(类型-0:项目,1:模块,2:操作,3:动作)"
      *     ),
      *     security={{"Authorization":{}}}
      * )
@@ -269,7 +270,7 @@ class AuthorityNodeController extends BaseController
      *                 @OA\Property(property="ID",type="int",description="节点ID"),
      *                 @OA\Property(property="NAME" ,type="string", description="菜单地址"),
      *                 @OA\Property(property="TITLE" ,type="string", description="菜单名称"),
-     *                 @OA\Property(property="LOGO" ,type="string",description="菜单前面的图标url"),
+     *                 @OA\Property(property="ICON" ,type="string",description="菜单前面的图标"),
      *                 @OA\Property(property="STATUS", type="int",description="菜单状态(1启用，0禁用)"),
      *                 @OA\Property(property="IS_MENU", type="int",description="是否菜单(0否，1是)"),
      *                 @OA\Property(property="IS_TOP_MENU", type="int",description="是否顶部菜单(0否，1是)"),

backend/models/v1/rbacuser/ShopRbacNode.php

@@ -12,7 +12,7 @@ use app\models\v1\BaseModel;
  * @property string $ORG_GUID 组织机构号
  * @property string $NAME 菜单地址
  * @property string $TITLE 菜单名称
- * @property string $LOGO 菜单前面的图标url
+ * @property string $ICON 菜单前面的图标url
  * @property int $STATUS 菜单状态 0禁用 1启用
  * @property int $IS_MENU 是否为菜单（1：是，0：不是）
  * @property int $IS_TOP_MENU 是否顶部菜单 1是 0否
@@ -41,7 +41,7 @@ class ShopRbacNode extends  BaseModel
             [['STATUS', 'IS_MENU', 'IS_TOP_MENU', 'IS_DEFAULT_SHOW', 'SORT', 'LEVEL'], 'integer'],
             [['ORG_GUID', 'TITLE'], 'string', 'max' => 50],
             [['NAME'], 'string', 'max' => 100],
-            [['LOGO', 'REMARK'], 'string', 'max' => 200],
+            [['ICON', 'REMARK'], 'string', 'max' => 200],
             [['PID'], 'string', 'max' => 11],
             [['TITLE', 'SORT', 'LEVEL'], 'required', 'on' => ['creation']],
             [['IS_MENU', 'IS_TOP_MENU', 'IS_DEFAULT_SHOW', 'PID'], 'default', 'value' => 0, 'on' => ['creation']],
@@ -59,7 +59,7 @@ class ShopRbacNode extends  BaseModel
             'ORG_GUID' => '组织机构号',
             'NAME' => '菜单地址',
             'TITLE' => '菜单名称',
-            'LOGO' => 'Logo',
+            'ICON' => '图标',
             'STATUS' => '菜单状态',
             'IS_MENU' => '是否为菜单',
             'IS_TOP_MENU' => '是否顶部菜单',
@@ -92,13 +92,13 @@ class ShopRbacNode extends  BaseModel
     public function nodeList($params)
     {
         $query = static::find()
-            ->select(['ID', 'NAME', 'TITLE', 'STATUS', 'IS_MENU', 'IS_TOP_MENU', 'IS_DEFAULT_SHOW', 'REMARK', 'SORT', 'PID', 'LEVEL'])
+            ->select(['ID', 'NAME', 'TITLE', 'ICON', 'STATUS', 'IS_MENU', 'IS_TOP_MENU', 'IS_DEFAULT_SHOW', 'REMARK', 'SORT', 'PID', 'LEVEL'])
             ->orderBy("SORT ASC")
             ->asArray();
         if (isset($params['TITLE'])) {
             $query->andFilterWhere(['like', 'TITLE', $params['TITLE']]);
         }
-        
+
         if (isset($params['STATUS'])) {
             $query->andFilterWhere(['STATUS' => $params['STATUS']]);
         }

backend/models/v1/shopgoods/ShopGoodsDetailSetting.php

@@ -151,21 +151,4 @@ class ShopGoodsDetailSetting extends \app\models\v1\BaseModel
         $dataProvider->setModels($list);
         return $dataProvider;
     }
-
-    /**
-     * 模板详情
-     * @param string $guid 模板GUID
-     * @return array|null 
-     */
-    public function details($guid)
-    {
-        $query = static::find()->alias('sgds')
-            ->select('sgds.GUID,sgds.NAME,sgds.STATUS,sgds.START_TIME,sgds.END_TIME,count(sg.GUID) as NUM,sgds.HEAD_PIC_URL,sgds.FOOT_PIC_URL')
-            ->leftJoin('shop_goods sg', 'sg.DETAIL_SETTING_GUID=sgds.GUID')
-            ->groupBy('sgds.GUID')
-            ->where(['sgds.GUID' => $guid])
-            ->one();
-        $query->toArray([], ['NUM']);
-        return $query;
-    }
 }