diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php index 66df1327..61253bb3 100644 --- a/app/common/repositories/store/product/ProductRepository.php +++ b/app/common/repositories/store/product/ProductRepository.php @@ -314,7 +314,7 @@ class ProductRepository extends BaseRepository $data['svip_price_type'] = $res['svip_price_type']; $settleParams = $this->setAttrValue($data, $id, 0, 1,$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']; unset($data['attrValue'],$data['attr'],$data['mer_cate_id']); $ret = Spu::getInstance()->where('product_id', $id)->whereIn('product_type',[0, 98, 99])->find(); diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php index 6eb4af3f..08fc6346 100644 --- a/app/controller/api/store/merchant/MerchantIntention.php +++ b/app/controller/api/store/merchant/MerchantIntention.php @@ -92,7 +92,8 @@ class MerchantIntention extends BaseController 'area' => $data['area_id'] ?? '', 'street' => $data['street_id'] ?? '', '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'; $res = $this->sendMerIntentionApply($sendData, $postUrl);