mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
shengchanzhe 2023-12-25 11:55:54 +08:00
parent 5a9aa8eceb
commit 07504a4b47
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common/repositories/store/product/ProductRepository.php
View File

@ -2594,8 +2594,10 @@ class ProductRepository extends BaseRepository
case 'seven': case 'seven':
$data['type'] = 8; $data['type'] = 8;
} }
$store_product=Db::name('store_product')->where('product_id',$data['product_id'])->find();
$datas = [ $datas = [
'product_id' => $data['product_id'], 'product_id' => $data['product_id'],
'cate_id' => $store_product['cate_id'],
'mer_id' => $merchant['mer_id'], 'mer_id' => $merchant['mer_id'],
'source_mer_id' => 0, 'source_mer_id' => 0,
'street_code' => $merchant['street_id'], 'street_code' => $merchant['street_id'],

11
app/controller/api/store/product/CloudWarehouse.php
View File

@ -43,10 +43,13 @@ class CloudWarehouse extends BaseController
* type_id 13云仓商品列表 * type_id 13云仓商品列表
* @return mixed * @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') $cloud_product_arr = Db::name('cloud_product')
->where('category_id', $category_id) ->whereIn('cate_id', $cate_id)
->where('street_code', $street_code) ->where('street_code', $street_code)
->where(function($query){ ->where(function($query){
$query->whereOr('mer_labels', '') $query->whereOr('mer_labels', '')
@ -66,10 +69,10 @@ class CloudWarehouse extends BaseController
'product_type' => 98, 'product_type' => 98,
'product_id' => $cloud_product 'product_id' => $cloud_product
]; ];
if (!$cloud_product && $category_id == 0) { if (!$cloud_product) {
return app('json')->success(['count' => 0, 'list' => []]); 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('street_code', $street_code)
->where(function($query){ ->where(function($query){
$query->whereOr('mer_labels', '') $query->whereOr('mer_labels', '')

1
app/listener/ProductCreate.php
View File

@ -53,6 +53,7 @@ class ProductCreate
$datas = [ $datas = [
'product_id' => $product_id, 'product_id' => $product_id,
'mer_id' => $merchant['mer_id'], 'mer_id' => $merchant['mer_id'],
'cate_id' => $product['cate_id'],
'source_mer_id' => $cityMerchant['mer_id'], 'source_mer_id' => $cityMerchant['mer_id'],
'street_code' => $merchant['street_id'], 'street_code' => $merchant['street_id'],
'type_id' => $merchant['type_id'], 'type_id' => $merchant['type_id'],