Skip to content

M
my-yaf-project
Commit 185cfc43 authored by lingqingmei's avatar lingqingmei
Browse files
Options

Merge branch 'lyz_cart' of http://git.shenbd.com/api-project-dev/api.shenbd.com into master_dev

parents 6ec10962 d331624f
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
application/models/Business/Goods/GoodsCommonService.php
View file @ 185cfc43
...@@ -1398,6 +1398,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel ...@@ -1398,6 +1398,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
$where['store_id'] = $goodsClass['store_id']; $where['store_id'] = $goodsClass['store_id'];
$where['goods_state'] = \Our\ApiConst::onlineGoodsState; $where['goods_state'] = \Our\ApiConst::onlineGoodsState;
$where['goods_verify'] = \Our\ApiConst::onlineGoodsVerify; $where['goods_verify'] = \Our\ApiConst::onlineGoodsVerify;
$where['is_del'] = \Our\ApiConst::onlineGoodsDel;
if($gcFrom==\Our\ApiConst::one){ if($gcFrom==\Our\ApiConst::one){
$where['goods_class_t_id'] = $goodsClass['gc_id_3']; $where['goods_class_t_id'] = $goodsClass['gc_id_3'];
}else{ }else{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment