diff --git a/app/api/controller/user/AddressController.php b/app/api/controller/user/AddressController.php
index 55bd819..54df7bc 100644
--- a/app/api/controller/user/AddressController.php
+++ b/app/api/controller/user/AddressController.php
@@ -24,10 +24,10 @@ class AddressController extends BaseApiController
         $params = (new UserAddressValidate())->post()->goCheck('add');
         $params['uid'] = $this->request->userId;
         $res=AddressLogic::add($params);
-        if($res){
-            return $this->success('添加成功');
-        }else{
+        if(AddressLogic::hasError()){
             return $this->fail(AddressLogic::getError());
+        }else{
+            return $this->success('添加成功');
         }
     }
     /**
@@ -35,7 +35,7 @@ class AddressController extends BaseApiController
      */
     public function merchant_create()
     {
-        $params = (new UserAddressValidate())->post()->goCheck('add');
+        $params = $this->request->post();
         if($params['order_id'] && $params['order_id']!=0){
             $uid=Cashierclass::where('id',$params['order_id'])->value('uid');
             if(!$uid || $uid<=0){
@@ -44,10 +44,11 @@ class AddressController extends BaseApiController
         }
         $params['uid'] = $uid;
         $res=AddressLogic::add($params);
-        if($res){
-            return $this->success('添加成功');
-        }else{
+        if(AddressLogic::hasError()){
             return $this->fail(AddressLogic::getError());
+        }else{
+            Cashierclass::where('id',$params['order_id'])->update(['address_id'=>$res,'real_name'=>$params['real_name'],'user_phone'=>$params['phone'],'user_address'=>$params['detail']]);
+            return $this->success('添加成功');
         }
     }
     /**
diff --git a/app/api/logic/user/AddressLogic.php b/app/api/logic/user/AddressLogic.php
index 7958e03..a1efca0 100644
--- a/app/api/logic/user/AddressLogic.php
+++ b/app/api/logic/user/AddressLogic.php
@@ -24,12 +24,14 @@ class AddressLogic extends BaseLogic
      */
     public static function add(array $params): bool
     {
-        // Db::startTrans();
-        // try {
-            if($params['is_default']==1){
+        Db::startTrans();
+        try {
+            if(isset($params['is_default'])&&$params['is_default']==1){
                 UserAddress::where('uid',$params['uid'])->update(['is_default'=>0]);
+            }else{
+                $params['is_default']=1;
             }
-            UserAddress::create([
+            $id=UserAddress::insertGetId([
                 'uid' => $params['uid'],
                 'real_name' => $params['real_name'],
                 'phone' => $params['phone'],
@@ -37,12 +39,12 @@ class AddressLogic extends BaseLogic
                 'is_default' => $params['is_default'],
             ]);
             Db::commit();
-            return true;
-        // } catch (\Exception $e) {
-        //     Db::rollback();
-        //     self::setError($e->getMessage());
-        //     return false;
-        // }
+            return $id;
+        } catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
     }
 
 
diff --git a/app/common/service/JsonService.php b/app/common/service/JsonService.php
index 7188e35..7dbb069 100644
--- a/app/common/service/JsonService.php
+++ b/app/common/service/JsonService.php
@@ -5,11 +5,11 @@ namespace app\common\service;
 
 
 use app\common\enum\ExportEnum;
-use app\common\exception\HttpException;
 use app\common\lists\BaseDataLists;
 use app\common\lists\ListsExcelInterface;
 use app\common\lists\ListsExtendInterface;
 use support\Response;
+use support\exception\BusinessException;
 
 class JsonService
 {
@@ -81,7 +81,7 @@ class JsonService
     public static function throw(string $msg = 'fail', array $data = [], int $code = 0, int $show = 1)
     {
         $data = compact('code', 'show', 'msg', 'data');
-        throw new HttpException(json_encode($data));
+        throw new BusinessException(json_encode($data));
     }
 
     /**