Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -59,7 +59,10 @@ class SuppliersController extends BaseController
         $token = $action_name. '+' .date('Y-m-d'). '+' .http_build_query($param);
         $token = $action_name. '+' .date('Y-m-d'). '+' .http_build_query($param);
         $param['token'] = md5($token);
         $param['token'] = md5($token);
         $res = http_post($url,json_encode($param));
         $res = http_post($url,json_encode($param));
-        return $this->success($res);
+        if($res['code'] != 200){
+            $this->response($res['message'],Code::SYSTEM_ERROR);
+        }
+        return $this->success($res['data']);
     }
     }
     /**
     /**
      * @remark :按名字搜索公司
      * @remark :按名字搜索公司

@@ -6,6 +6,7 @@ use App\Http\Logic\Bside\BaseLogic;
 use App\Models\WebSetting\WebSettingReceiving;
 use App\Models\WebSetting\WebSettingReceiving;
 use App\Models\WebSetting\WebSettingText;
 use App\Models\WebSetting\WebSettingText;
 use App\Services\SyncService;
 use App\Services\SyncService;
+use Illuminate\Support\Facades\DB;
 
 
 class WebSettingReceivingLogic extends BaseLogic
 class WebSettingReceivingLogic extends BaseLogic
 {
 {
@@ -34,9 +35,18 @@ class WebSettingReceivingLogic extends BaseLogic
      * @time   :2023/5/8 16:26
      * @time   :2023/5/8 16:26
      */
      */
     public function setting_receiving_save(){
     public function setting_receiving_save(){
+        $data = [];
+        DB::connection('custom_mysql')->beginTransaction();
         try {
         try {
             $this->model->del(['project_id'=>$this->user['project_id']]);
             $this->model->del(['project_id'=>$this->user['project_id']]);
-            foreach ($this->param['data'] as $k => $v){
+            foreach ($this->param['data'] as  $v){
+                if($v['type'] == 1){
+                    // 使用正则表达式匹配中国大陆手机号
+                    $pattern = '/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/';
+                    if (!preg_match($pattern, $v['values'])) {
+                        continue;
+                    }
+                }
                 if($v['type'] == 2){
                 if($v['type'] == 2){
                     // 使用正则表达式匹配中国大陆手机号
                     // 使用正则表达式匹配中国大陆手机号
                     $pattern = '/^1[3456789]\d{9}$/';
                     $pattern = '/^1[3456789]\d{9}$/';
@@ -47,11 +57,15 @@ class WebSettingReceivingLogic extends BaseLogic
                 $v['project_id'] = $this->user['project_id'];
                 $v['project_id'] = $this->user['project_id'];
                 $v['created_at'] = date('Y-m-d H:i:s');
                 $v['created_at'] = date('Y-m-d H:i:s');
                 $v['updated_at'] = date('Y-m-d H:i:s');
                 $v['updated_at'] = date('Y-m-d H:i:s');
-                $this->param['data'][$k] = $v;
+                $data[] = $v;
+            }
+            if(!empty($data)){
+                $this->model->insert($data);
             }
             }
-            $this->model->insert($this->param['data']);
+            DB::connection('custom_mysql')->commit();
         }catch (\Exception $e){
         }catch (\Exception $e){
-            $this->fail('error');
+            DB::connection('custom_mysql')->rollBack();
+            $this->fail('编辑失败，请联系管理员');
         }
         }
         (new SyncService())->projectAcceptAddress($this->user['project_id']);
         (new SyncService())->projectAcceptAddress($this->user['project_id']);
         return $this->success();
         return $this->success();

@@ -37,7 +37,7 @@ class WebSettingServiceLogic extends BaseLogic
      * @time   :2023/5/4 11:10
      * @time   :2023/5/4 11:10
      */
      */
     public function setting_service_save(){
     public function setting_service_save(){
-        DB::beginTransaction();
+        DB::connection('custom_mysql')->beginTransaction();
         try {
         try {
             $this->param['data'] = Common::uniqueMultiArray($this->param['data']);
             $this->param['data'] = Common::uniqueMultiArray($this->param['data']);
             //删除以前的数据
             //删除以前的数据
@@ -54,10 +54,9 @@ class WebSettingServiceLogic extends BaseLogic
             if(!empty($data)){
             if(!empty($data)){
                 $this->model->insert($data);
                 $this->model->insert($data);
             }
             }
-
-            DB::commit();
+            DB::connection('custom_mysql')->commit();
         }catch (\Exception $e){
         }catch (\Exception $e){
-            DB::rollBack();
+            DB::connection('custom_mysql')->rollBack();
             $this->fail('系统错误，请联系管理员');
             $this->fail('系统错误，请联系管理员');
         }
         }
         return $this->success();
         return $this->success();