From 3d0804037b4107d9b6e5d8c948c9d78b1b97b305 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Thu, 25 May 2023 13:56:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/merchant/MerchantRepository.php            | 11 +++++------
 app/controller/admin/system/merchant/Merchant.php     |  9 ---------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/app/common/repositories/system/merchant/MerchantRepository.php b/app/common/repositories/system/merchant/MerchantRepository.php
index eb531ce3..8ff28c91 100644
--- a/app/common/repositories/system/merchant/MerchantRepository.php
+++ b/app/common/repositories/system/merchant/MerchantRepository.php
@@ -221,8 +221,11 @@ class MerchantRepository extends BaseRepository
         if($data['type_id'] == 0){
             $data['type_id'] = '';
         }
-        $find=Db::name('merchant_address')->where('mer_id',$id)->find();
-        $data['geo_address']=$find;
+        $data['geo_address'] = [
+            'area_id' => $data['area_id'],
+            'street_id' => $data['street_id'],
+            'village_id' => $data['village_id'],
+        ];
         return $data;
 //        return $this->form($id, $data);
     }
@@ -260,10 +263,6 @@ class MerchantRepository extends BaseRepository
 
             $merchant = $this->dao->create($data);
             $merchant['merchant_admin']=$make->createMerchantAccount($merchant, $account, $password);
-            $address_id = Db::name('merchant_address')->insertGetId(['mer_id'=>$merchant->mer_id,'street_id'=>$data['street_id'],'area_id'=>$data['area_id'],'village_id'=>$data['village_id']]);
-            if($data['area_id'] && $data['village_id']){
-                Db::name('merchant_address')->where('id',$address_id)->update(['area_id'=>$data['area_id'],'village_id'=>$data['village_id']]);
-            }
             app()->make(ShippingTemplateRepository::class)->createDefault($merchant->mer_id);
             app()->make(ProductCopyRepository::class)->defaulCopyNum($merchant->mer_id);
             return $merchant;
diff --git a/app/controller/admin/system/merchant/Merchant.php b/app/controller/admin/system/merchant/Merchant.php
index 7945288a..f3107058 100644
--- a/app/controller/admin/system/merchant/Merchant.php
+++ b/app/controller/admin/system/merchant/Merchant.php
@@ -148,16 +148,7 @@ class Merchant extends BaseController
         $data['margin'] = $margin['margin'];
         $data['is_margin'] = $margin['is_margin'];
         $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'=>$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'=>$data['area_id'],'street_id'=>$data['street_id'],'village_id'=>$data['village_id']];
-                Db::name('merchant_address')->insert($adds1);
-            }
         return app('json')->success('编辑成功');
     }