Ver código fonte

goodsIntroduce

shish 6 anos atrás
pai
commit
24f64e809f

+ 3 - 16
common/models/xhGoodsSetting.php

@@ -2,20 +2,7 @@
 
 namespace common\models;
 
-/**
- * This is the model class for table "xhGoodsSetting".
- *
- * @property int $id
- * @property int $merchantId 商家id
- * @property int $startRiseTime 开始涨价时间
- * @property int $endRiseTime 结束涨价时间
- * @property int $riseType 涨价方式 0按百分比 1按金额
- * @property int $riseAmount 涨价金额或百分比数
- * @property string $goodSIntroduce 商品统一说明
- * @property int $addTime 添加时间
- * @property string $createTime 创建时间
- * @property string $updateTime
- */
+
 class xhGoodsSetting extends xhBaseModel
 {
     /**
@@ -35,7 +22,7 @@ class xhGoodsSetting extends xhBaseModel
             [['merchantId', 'startRiseTime', 'endRiseTime', 'riseType', 'riseAmount', 'addTime'], 'integer'],
             [['createTime'], 'required'],
             [['createTime', 'updateTime'], 'safe'],
-            [['goodSIntroduce'], 'string', 'max' => 10000],
+            [['goodsIntroduce'], 'string', 'max' => 10000],
             [['merchantId'], 'unique'],
         ];
     }
@@ -52,7 +39,7 @@ class xhGoodsSetting extends xhBaseModel
             'endRiseTime' => 'End Rise Time',
             'riseType' => 'Rise Type',
             'riseAmount' => 'Rise Amount',
-            'goodSIntroduce' => 'Good Sintroduce',
+            'goodsIntroduce' => 'goodsIntroduce',
             'addTime' => 'Add Time',
             'createTime' => 'Create Time',
             'updateTime' => 'Update Time',

+ 2 - 2
common/services/xhGoodsSettingService.php

@@ -36,7 +36,7 @@ class xhGoodsSettingService {
 		$byPercent						= configDict::getConfig('riseType','percent');
 		$byAmount						= configDict::getConfig('riseType','amount');
 		if(!empty($set)){
-			$goods['goodSIntroduce']	= $set['goodSIntroduce'];
+			$goods['goodsIntroduce']	= $set['goodsIntroduce'];
 			$goods['riseType']			= $noRise;
 			$goods['riseAmount']		= $riseAmount;
 			if($set['riseType'] != $noRise){
@@ -66,7 +66,7 @@ class xhGoodsSettingService {
         $byPercent						= configDict::getConfig('riseType','percent');
         $byAmount						= configDict::getConfig('riseType','amount');
         if(!empty($set)){
-            $goods['goodSIntroduce']	= $set['goodSIntroduce'];
+            $goods['goodsIntroduce']	= $set['goodsIntroduce'];
             $goods['riseType']			= $noRise;
             $goods['riseAmount']		= $riseAmount;
             if($set['riseType'] != $noRise){