商品增加删除标识

app/business/controllers/GoodsController.php

@@ -31,6 +31,7 @@ class GoodsController extends BaseController
 			$where['goodsName'] = ['like', $goodsName];
 		}
 		$where['merchantId'] = $this->merchantId;
+		$where['delStatus'] = 0;
 		$data = GoodsService::getGoodsList($where);
 		$asset = $this->merchantAsset;
 		$data['MerchantAsset'] = $asset;

sql.txt

@@ -1,3 +1,7 @@
+2019.12.31 shish 商品相关
+ALTER TABLE `xhGoods` ADD delStatus TINYINT NOT NULL DEFAULT 0 COMMENT '删除标识 0未删除 1删除' AFTER `riseAmount`;
+ALTER TABLE `xhGoodsCategory` ADD delStatus TINYINT NOT NULL DEFAULT 0 COMMENT '删除标识 0未删除 1已删除' AFTER `merchantId`;
+
 2019.12.29 shish 会员 这个需要特别注意国兰数据迁移问题！！！！
 ALTER TABLE `xhUserAsset` MODIFY `memberLevel` SMALLINT NOT NULL DEFAULT -1 COMMENT '会员等级 -1普通用户 0普通会员，登记了手机号 1 一级会员';
 ALTER TABLE `xhUserAsset` CHANGE `memberLevel` `member` SMALLINT NOT NULL DEFAULT -1 COMMENT '会员等级 -1普通用户 0普通会员，登记了手机号 1 一级会员';