更新
This commit is contained in:
parent
5a9aa8eceb
commit
07504a4b47
@ -2594,8 +2594,10 @@ class ProductRepository extends BaseRepository
|
||||
case 'seven':
|
||||
$data['type'] = 8;
|
||||
}
|
||||
$store_product=Db::name('store_product')->where('product_id',$data['product_id'])->find();
|
||||
$datas = [
|
||||
'product_id' => $data['product_id'],
|
||||
'cate_id' => $store_product['cate_id'],
|
||||
'mer_id' => $merchant['mer_id'],
|
||||
'source_mer_id' => 0,
|
||||
'street_code' => $merchant['street_id'],
|
||||
|
@ -43,10 +43,13 @@ class CloudWarehouse extends BaseController
|
||||
* type_id 13云仓商品列表
|
||||
* @return mixed
|
||||
*/
|
||||
public function index($street_code, $page = 1, $category_id = 0, $location = '')
|
||||
public function index($street_code, $page = 1, $category_id = 0, $cate_pid = 0,$cate_id = 0,$location = '')
|
||||
{
|
||||
if($cate_pid!=0){
|
||||
$cate_id=Db::name('store_category')->where('pid',$cate_pid)->where('is_show',1)->column('store_category_id');
|
||||
}
|
||||
$cloud_product_arr = Db::name('cloud_product')
|
||||
->where('category_id', $category_id)
|
||||
->whereIn('cate_id', $cate_id)
|
||||
->where('street_code', $street_code)
|
||||
->where(function($query){
|
||||
$query->whereOr('mer_labels', '')
|
||||
@ -66,10 +69,10 @@ class CloudWarehouse extends BaseController
|
||||
'product_type' => 98,
|
||||
'product_id' => $cloud_product
|
||||
];
|
||||
if (!$cloud_product && $category_id == 0) {
|
||||
if (!$cloud_product) {
|
||||
return app('json')->success(['count' => 0, 'list' => []]);
|
||||
}
|
||||
$count = Db::name('cloud_product')->where('category_id', $category_id)
|
||||
$count = Db::name('cloud_product')->whereIn('cate_id', $cate_id)
|
||||
->where('street_code', $street_code)
|
||||
->where(function($query){
|
||||
$query->whereOr('mer_labels', '')
|
||||
|
@ -53,6 +53,7 @@ class ProductCreate
|
||||
$datas = [
|
||||
'product_id' => $product_id,
|
||||
'mer_id' => $merchant['mer_id'],
|
||||
'cate_id' => $product['cate_id'],
|
||||
'source_mer_id' => $cityMerchant['mer_id'],
|
||||
'street_code' => $merchant['street_id'],
|
||||
'type_id' => $merchant['type_id'],
|
||||
|
Loading…
x
Reference in New Issue
Block a user