From 85200033746b9e60c4b72f97d5551fa1a6bb33a1 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sun, 23 Apr 2023 14:36:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/product/ProductRepository.php | 2 +- .../system/merchant/MerchantRepository.php | 7 ++++--- .../admin/system/merchant/Merchant.php | 20 +++++++++---------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php index 1b209939..39987d21 100644 --- a/app/common/repositories/store/product/ProductRepository.php +++ b/app/common/repositories/store/product/ProductRepository.php @@ -74,7 +74,7 @@ class ProductRepository extends BaseRepository ['params',[]], ]; protected $admin_filed = 'Product.product_id,Product.mer_id,brand_id,spec_type,unit_name,mer_status,rate,reply_count,store_info,cate_id,Product.image,slider_image,Product.store_name,Product.keyword,Product.sort,U.rank,Product.is_show,Product.sales,Product.price,extension_type,refusal,cost,ot_price,stock,is_gift_bag,Product.care_count,Product.status,is_used,Product.create_time,Product.product_type,old_product_id,star,ficti,integral_total,integral_price_total,sys_labels,param_temp_id,mer_svip_status,svip_price,svip_price_type'; - protected $filed = 'Product.product_id,Product.mer_id,brand_id,unit_name,spec_type,mer_status,rate,reply_count,store_info,cate_id,Product.image,slider_image,Product.store_name,Product.keyword,Product.sort,Product.is_show,Product.sales,Product.price,extension_type,refusal,cost,ot_price,stock,is_gift_bag,Product.care_count,Product.status,is_used,Product.create_time,Product.product_type,old_product_id,integral_total,integral_price_total,mer_labels,Product.is_good,Product.is_del,type,param_temp_id,mer_svip_status,svip_price,svip_price_type'; + protected $filed = 'Product.bar_code,Product.product_id,Product.mer_id,brand_id,unit_name,spec_type,mer_status,rate,reply_count,store_info,cate_id,Product.image,slider_image,Product.store_name,Product.keyword,Product.sort,Product.is_show,Product.sales,Product.price,extension_type,refusal,cost,ot_price,stock,is_gift_bag,Product.care_count,Product.status,is_used,Product.create_time,Product.product_type,old_product_id,integral_total,integral_price_total,mer_labels,Product.is_good,Product.is_del,type,param_temp_id,mer_svip_status,svip_price,svip_price_type'; const NOTIC_MSG = [ 1 => [ diff --git a/app/common/repositories/system/merchant/MerchantRepository.php b/app/common/repositories/system/merchant/MerchantRepository.php index 602ec6f5..5765ee5d 100644 --- a/app/common/repositories/system/merchant/MerchantRepository.php +++ b/app/common/repositories/system/merchant/MerchantRepository.php @@ -215,9 +215,10 @@ class MerchantRepository extends BaseRepository if($data['type_id'] == 0){ $data['type_id'] = ''; } - $find=Db::name('merchant_address')->where('mer_id')->value('street_id'); - $data['geo_street']=$find; - return $this->form($id, $data); + $find=Db::name('merchant_address')->where('mer_id',$id)->find(); + $data['geo_address']=$find; + return $data; +// return $this->form($id, $data); } /** diff --git a/app/controller/admin/system/merchant/Merchant.php b/app/controller/admin/system/merchant/Merchant.php index 9b76ff4a..7945288a 100644 --- a/app/controller/admin/system/merchant/Merchant.php +++ b/app/controller/admin/system/merchant/Merchant.php @@ -118,8 +118,8 @@ class Merchant extends BaseController { if (!$this->repository->exists($id)) return app('json')->fail('数据不存在'); - - return app('json')->success(formToData($this->repository->updateForm($id))); + return app('json')->success($this->repository->updateForm($id)); +// return app('json')->success(formToData($this->repository->updateForm($id))); } /** @@ -147,19 +147,17 @@ class Merchant extends BaseController $margin = $this->repository->checkMargin($id, $data['type_id']); $data['margin'] = $margin['margin']; $data['is_margin'] = $margin['is_margin']; - $geo_street=$data['geo_street'];//添加商圈 - unset($data['geo_street']); - $this->repository->update($id, $data); - if ($geo_street){ - $adds=Db::name('merchant_address')->where('mer_id',$id)->find(); + $datas=$data; + unset($datas['area_id'],$datas['street_id'],$datas['village_id']); + $this->repository->update($id, $datas); + $adds=Db::name('merchant_address')->where('mer_id',$id)->find(); if($adds){ - $adds1=['area_id'=>$geo_street[0],'street_id'=>$geo_street[1],'village_id'=>$geo_street[2]]; + $adds1=['area_id'=>$data['area_id'],'street_id'=>$data['street_id'],'village_id'=>$data['village_id']]; Db::name('merchant_address')->where('mer_id',$id)->update($adds1); }else{ - $adds1=['mer_id'=>$id,'area_id'=>$geo_street[0],'street_id'=>$geo_street[1],'village_id'=>$geo_street[2]]; + $adds1=['mer_id'=>$id,'area_id'=>$data['area_id'],'street_id'=>$data['street_id'],'village_id'=>$data['village_id']]; Db::name('merchant_address')->insert($adds1); } - } return app('json')->success('编辑成功'); } @@ -189,7 +187,7 @@ class Merchant extends BaseController */ public function checkParam(MerchantValidate $validate, $isUpdate = false) { - $data = $this->request->params([['area_id',0],['street_id',0],['village_id',0],['geo_street',0],['category_id', 0], ['type_id', 0], 'mer_name', 'commission_rate', 'real_name', 'mer_phone', 'mer_keyword', 'mer_address', 'mark', ['sort', 0], ['status', 0], ['is_audit', 0], ['is_best', 0], ['is_bro_goods', 0], ['is_bro_room', 0], ['is_trader', 0],'sub_mchid']); + $data = $this->request->params([['area_id',0],['street_id',0],['village_id',0],['category_id', 0], ['type_id', 0], 'mer_name', 'commission_rate', 'real_name', 'mer_phone', 'mer_keyword', 'mer_address', 'mark', ['sort', 0], ['status', 0], ['is_audit', 0], ['is_best', 0], ['is_bro_goods', 0], ['is_bro_room', 0], ['is_trader', 0],'sub_mchid']); if (!$isUpdate) { $data += $this->request->params(['mer_account', 'mer_password']); }else {