drop itemNum

biz/goods/classes/GoodsClass.php

@@ -63,6 +63,9 @@ class GoodsClass extends BaseClass
         $goodsStyleList = isset($data['goodsStyleList']) && !empty($data['goodsStyleList']) ? $data['goodsStyleList'] : [];
 
         if (isset($data['goodsStyle']) && $data['goodsStyle'] == 1) {
+            if (empty($goodsStyleList)) {
+                util::fail('请填写款式');
+            }
             foreach ($goodsStyleList as $goodsStyle) {
                 if (empty($goodsStyle['styleName'])) {
                     util::fail('请填写款式名称');

console/controllers/UpgradeController.php

@@ -1421,7 +1421,7 @@ ALTER TABLE `xhMerchantExtend` MODIFY `alipayPublicKey` VARCHAR(5000) NOT NULL D
 		$sql = "ALTER TABLE `xhCouponAsset` MODIFY `switch` TINYINT NOT NULL DEFAULT 1 COMMENT '新客注册会员送券 1开启 0关闭';";
 		Yii::$app->db->createCommand($sql)->execute($sql);
 
-		$sql = "ALTER TABLE `xhGoods` MODIFY `stock` INT NOT NULL DEFAULT -1 COMMENT '库存 -1充足';UPDATE `xhGoods` SET stock=-1;";
+		$sql = "ALTER TABLE `xhGoods` MODIFY `stock` INT NOT NULL DEFAULT -1 COMMENT '库存 -1充足';UPDATE `xhGoods` SET stock=-1;ALTER TABLE `xhGoods` DROP INDEX `itemNumber`;";
         Yii::$app->db->createCommand($sql)->execute($sql);
 
 	}