Commit f46cffe0 authored by hj's avatar hj

更新提交

parent c760d2fe
......@@ -35,7 +35,7 @@ class ProductDetailTransformer extends TransformerAbstract
$productTransReturn['price'] = $products['p_price'];//单价
$productTransReturn['market_price'] = $products['m_price'];//目录价格
$productTransReturn['p_stock'] = $products['p_stock'];
if($products['r_status'] == 0 || $products['p_status'] == 0 || $products['p_show'] == 0 || $products['p_if_big'] == 1){
if($products['r_status'] == 0 || $products['p_status'] == 0 || $products['p_show'] == 0 || $products['p_if_big'] == 1 || $products['c_status'] == 0){
$productTransReturn['status'] = 0;
$productTransReturn['price'] = 0;
$productTransReturn['market_price'] = 0;
......
......@@ -55,7 +55,7 @@ class ProductsTransformer extends TransformerAbstract
}else{
$temp['if_dangers'] = 0;//是否危化品
}
if($product['r_status'] == 0 || $product['p_status'] == 0 || $product['p_show'] == 0 || $product['p_if_big'] == 1){
if($product['r_status'] == 0 || $product['p_status'] == 0 || $product['p_show'] == 0 || $product['p_if_big'] == 1 || $product['c_status'] == 0){
$temp['status'] = 0;
$temp['price'] = 0;
$temp['market_price'] = 0;
......
......@@ -35,7 +35,7 @@ class RhawnProductRepositoryEloquent extends BaseRepository implements RhawnProd
}else{
$productsModel->whereIn('products.p_code',$pCode);
}
$productsModel->where('chemicals.c_status', 1);
//$productsModel->where('chemicals.c_status', 1);
$product = $productsModel->get();
if($product){
return $product->toArray();
......@@ -118,7 +118,7 @@ class RhawnProductRepositoryEloquent extends BaseRepository implements RhawnProd
}
}
}
$productsModel->where('chemicals.c_status', 1);
///$productsModel->where('chemicals.c_status', 1);
$product = $productsModel->offset($offset)->limit($limit)->get();
if($product){
return $product->toArray();
......@@ -129,7 +129,7 @@ class RhawnProductRepositoryEloquent extends BaseRepository implements RhawnProd
public function getProductsByCas($cas)
{
$productsModel = $this->join('chemicals', 'chemicals.c_id','products.c_id')->join('raw', 'raw.r_id','products.r_id');
$productsModel->where('chemicals.c_status', 1);
//$productsModel->where('chemicals.c_status', 1);
$product = $productsModel->where('chemicals.c_cas',$cas)->get();
if($product){
return $product->toArray();
......
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