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

更新

Browse Source
This commit is contained in:
mkm 2023-11-16 11:27:38 +08:00
parent 5960a87485
commit 18bac6ba1b
2 changed files with 3 additions and 2 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

@ -314,7 +314,7 @@ class ProductRepository extends BaseRepository
$data['svip_price_type'] = $res['svip_price_type']; $data['svip_price_type'] = $res['svip_price_type'];
$settleParams = $this->setAttrValue($data, $id, 0, 1,$merId); $settleParams = $this->setAttrValue($data, $id, 0, 1,$merId);
$settleParams['cate'] = $this->setMerCate($data['mer_cate_id'], $id, $merId); $settleParams['cate'] = $this->setMerCate($data['mer_cate_id'], $id, $merId);
$settleParams['attr'] = $this->setAttr($data['attr'], $id); // $settleParams['attr'] = $this->setAttr($data['attr'], $id);
$data['price'] = $settleParams['data']['price']; $data['price'] = $settleParams['data']['price'];
unset($data['attrValue'],$data['attr'],$data['mer_cate_id']); unset($data['attrValue'],$data['attr'],$data['mer_cate_id']);
$ret = Spu::getInstance()->where('product_id', $id)->whereIn('product_type',[0, 98, 99])->find(); $ret = Spu::getInstance()->where('product_id', $id)->whereIn('product_type',[0, 98, 99])->find();

3
app/controller/api/store/merchant/MerchantIntention.php
View File

@ -92,7 +92,8 @@ class MerchantIntention extends BaseController
'area' => $data['area_id'] ?? '', 'area' => $data['area_id'] ?? '',
'street' => $data['street_id'] ?? '', 'street' => $data['street_id'] ?? '',
'address' => $data['address'] ?? '', 'address' => $data['address'] ?? '',
'mer_intention_id' => $intention->mer_intention_id 'mer_intention_id' => $intention->mer_intention_id,
'type_id'=>$data['mer_type_id']
]; ];
$postUrl = env('TASK_WORKER_HOST_URL') . '/adminapi/company/createShopMerchant'; $postUrl = env('TASK_WORKER_HOST_URL') . '/adminapi/company/createShopMerchant';
$res = $this->sendMerIntentionApply($sendData, $postUrl); $res = $this->sendMerIntentionApply($sendData, $postUrl);