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

更新状态查询

Browse Source
This commit is contained in:
yaooo 2023-09-04 13:08:13 +08:00
parent e95dd996f6
commit ccbd53a895
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controller/api/store/product/StoreSpu.php
View File

@ -143,12 +143,13 @@ class StoreSpu extends BaseController
]); ]);
if ($where['action']) unset($where['product_type']); if ($where['action']) unset($where['product_type']);
$currentMerchant = Db::name('merchant')->where('mer_id',$id)->field('category_id,street_id')->find(); $currentMerchant = Db::name('merchant')->where('mer_id',$id)->field('category_id,street_id')->find();
$typeCloudWarehouseId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeCloudWarehouse'])->value('mer_type_id');
$mer_id = Db::name('merchant') $mer_id = Db::name('merchant')
->where('street_id',$currentMerchant['street_id']) ->where('street_id',$currentMerchant['street_id'])
->where('mer_state',1) ->where('mer_state',1)
->where('status',1) ->where('status',1)
->where('category_id',$currentMerchant['category_id']) ->where('category_id',$currentMerchant['category_id'])
->where('type_id',Merchant::TypeCloudWarehouse) ->where('type_id', $typeCloudWarehouseId)
->value('mer_id'); ->value('mer_id');
if (!$mer_id) { if (!$mer_id) {
return app('json')->success(['count'=>0,'list'=>[]]); return app('json')->success(['count'=>0,'list'=>[]]);

3
app/listener/CloudProduct.php
View File

@ -18,6 +18,7 @@ class CloudProduct
{ {
$productIds = $event['product_id']; $productIds = $event['product_id'];
$typeStoreId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeStore'])->value('mer_type_id'); $typeStoreId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeStore'])->value('mer_type_id');
$typeCloudWarehouseId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeCloudWarehouse'])->value('mer_type_id');
$products = Product::withTrashed()->whereIn('product_id', $productIds)->field('product_id,mer_id,status,is_del,is_show,mer_status,is_used')->select(); $products = Product::withTrashed()->whereIn('product_id', $productIds)->field('product_id,mer_id,status,is_del,is_show,mer_status,is_used')->select();
/** @var CloudProductDao $repo */ /** @var CloudProductDao $repo */
$repo = app()->make(CloudProductDao::class); $repo = app()->make(CloudProductDao::class);
@ -29,7 +30,7 @@ class CloudProduct
if (!$categoryId) { if (!$categoryId) {
continue; continue;
} }
$cloudMerchant = Merchant::getDB()->where(['type_id' => Merchant::TypeCloudWarehouse, 'category_id' => $categoryId, 'status' => 1, 'mer_state' => 1])->value('mer_id'); $cloudMerchant = Merchant::getDB()->where(['type_id' => $typeCloudWarehouseId, 'category_id' => $categoryId, 'status' => 1, 'mer_state' => 1])->value('mer_id');
if (empty($cloudMerchant)) { if (empty($cloudMerchant)) {
continue; continue;
} }

3
app/listener/ProductCreate.php
View File

@ -19,7 +19,8 @@ class ProductCreate
if (empty($merchant)) { if (empty($merchant)) {
return false; return false;
} }
if ($merchant['type_id'] == Merchant::TypePlatform || $merchant['type_id'] == Merchant::TypeCloudWarehouse) { $typeCloudWarehouseId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeCloudWarehouse'])->value('mer_type_id');
if ($merchant['type_id'] == Merchant::TypePlatform || $merchant['type_id'] == $typeCloudWarehouseId) {
return false; return false;
} }

4
app/listener/paySuccessOrder.php
View File

@ -104,9 +104,9 @@ class paySuccessOrder
} }
} }
} }
$typeCloudWarehouseId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeCloudWarehouse'])->value('mer_type_id');
//云仓佣金 //云仓佣金
$this->calculate(Merchant::TypeCloudWarehouse, 'commission_to_cloud_rate'); $this->calculate($TypeCloudWarehouse, 'commission_to_cloud_rate');
} }
if ($this->remain > 0) { if ($this->remain > 0) {