shish пре 6 година
родитељ
комит
a15d8dd8ca

+ 1 - 1
biz/goods/services/GoodsCategoryService.php

@@ -32,7 +32,7 @@ class GoodsCategoryService extends BaseService
 	{
 		$ids = array_column($category, 'id');
 		//取出分类下的商品id
-		$list = GoodsCategoryClass::getAllByCondition(['cId' => ['in', $ids]], null, '*');
+		$list = GoodsCategoryClass::getAllByCondition(['cId' => ['in', $ids]], 'inTurn DESC,addTime DESC', '*');
 		if (empty($list)) {
 			foreach ($category as $key => $val) {
 				$category[$key]['goodsInfoList'] = [];

+ 1 - 1
console/controllers/UpgradeController.php

@@ -1463,7 +1463,7 @@ UPDATE `xhUserAsset` SET `member`=0 WHERE `member`=-1;";
 		$sql = "UPDATE `xhSetMeal` SET price=3980;";
 		Yii::$app->db->createCommand($sql)->execute($sql);
 
-		$sql = "ALTER TABLE `xhGoodsCategory` MODIFY `inTurn` INT NOT NULL DEFAULT 0 COMMENT '排序';";
+		$sql = "ALTER TABLE `xhGoodsCategory` MODIFY `inTurn` INT NOT NULL DEFAULT 0 COMMENT '排序';ALTER TABLE `xhGoodsCategory` ADD `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间' AFTER `inTurn`;";
 		Yii::$app->db->createCommand($sql)->execute($sql);
 
 	}