wanma-benteng
/
new-admin-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化：商品增加默认发货门店

This commit is contained in:
wuhui_zzw 2024-05-23 14:52:15 +08:00
parent 8ef885026a
commit 26ed341714
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -541,6 +541,7 @@ class ProductRepository extends BaseRepository
if (isset($data['param_temp_id'])) $result['param_temp_id'] = $data['param_temp_id'];
// 省公司及供应商提成
if (isset($data['agent_two_ids'])) $result['agent_two_ids'] = is_array($data['agent_two_ids']) ? implode(',',$data['agent_two_ids']) : $data['agent_two_ids'];
if (isset($data['agent_two_mer_id'])) $result['agent_two_mer_id'] = $data['agent_two_mer_id'];
if (isset($data['agent_two_money'])) $result['agent_two_money'] = $data['agent_two_money'];
if (isset($data['supplier_money'])) $result['supplier_money'] = $data['supplier_money'];
@ -1326,7 +1327,7 @@ class ProductRepository extends BaseRepository
public function apiProductDetail($where,int $productType, ?int $activityId, $userInfo = null)
{
$field = 'is_show,product_id,mer_id,image,slider_image,store_name,store_info,unit_name,price,cost,ot_price,stock,sales,video_link,product_type,extension_type,old_product_id,rate,guarantee_template_id,temp_id,once_max_count,pay_limit,once_min_count,integral_rate,delivery_way,delivery_free,type,cate_id,svip_price_type,svip_price,mer_svip_status,agent_two_ids,copy_product_id,supplier_mer_id';
$field = 'is_show,product_id,mer_id,image,slider_image,store_name,store_info,unit_name,price,cost,ot_price,stock,sales,video_link,product_type,extension_type,old_product_id,rate,guarantee_template_id,temp_id,once_max_count,pay_limit,once_min_count,integral_rate,delivery_way,delivery_free,type,cate_id,svip_price_type,svip_price,mer_svip_status,agent_two_ids,agent_two_mer_id,copy_product_id,supplier_mer_id';
$with = [
'attr',
'attrValue',

1
app/controller/admin/store/StoreProduct.php
View File

@ -161,6 +161,7 @@ class StoreProduct extends BaseController
'rank',
'star',
['agent_two_ids', []],
['agent_two_mer_id', 0],
'agent_two_money',
'supplier_money'
]);