kevin_zhangl 3 лет назад
Родитель
Сommit
25cb6248c9
1 измененных файлов с 11 добавлено и 4 удалено
  1. 11 4
      common/models/ShopGoods.php

+ 11 - 4
common/models/ShopGoods.php

@@ -35,8 +35,11 @@ class ShopGoods extends \common\components\ActiveRecord
             'name' => '余额购买',
         ],
         2 => [
-            'name' => '积分兑换',
+            'name' => '复消兑换',
         ],
+        3 => [
+            'name' => '积分兑换'
+        ]
     ];
     const GOODS_TYPE = [
         1 =>[
@@ -80,8 +83,8 @@ class ShopGoods extends \common\components\ActiveRecord
     public function rules()
     {
         return [
-            [['GOODS_NAME', 'CATE_ID', 'TYPE','GIFT_TYPE', 'SELL_TYPE', 'GOODS_NO', 'SELL_PRICE','MARKET_PRICE','PRICE_PV','STORE_NUMS'], 'required'],
-            [['TYPE','STORE_NUMS'], 'integer'],
+            [['SELL_DISCOUNT','GOODS_NAME', 'CATE_ID','GIFT_TYPE', 'GOODS_NO', 'SELL_PRICE','MARKET_PRICE','PRICE_PV','STORE_NUMS'], 'required'],
+            [['STORE_NUMS'], 'integer'],
             [['SELL_PRICE','MARKET_PRICE','PRICE_PV','POINT'], 'number'],
             [['ID','CATE_ID', 'GOODS_NO','SELL_TYPE','GIFT_TYPE'], 'string', 'max' => 32],
             [['UNIT'], 'string', 'max' => 16],
@@ -101,7 +104,8 @@ class ShopGoods extends \common\components\ActiveRecord
             'ID' => 'ID',
             'GOODS_NAME' => '商品名称',
             'CATE_ID' => '所属分类ID',
-            'TYPE' => '商品来源',
+            // 'TYPE' => '商品来源',
+            'SELL_DISCOUNT' => '会员折扣',
             'GIFT_TYPE' => '商品类型',
             'SELL_TYPE' => '出售方式',
             'GOODS_NO' => '商品编号',
@@ -162,6 +166,9 @@ class ShopGoods extends \common\components\ActiveRecord
             'point'=>[
                 'name'=>'积分支付'
             ],
+            'exchange' => [
+                'name' => '无业绩兑换券'
+            ]
         ];
     }