周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 cf384af0da6b3a5e810c49b68e773306d8275c41 2 个父辈 92006f9c 6dbf2ea6

合并分支 'develop' 到 'master' 

Develop



查看合并请求 !417
内嵌 并排对比
正在显示 3 个修改的文件 包含 38 行增加 和 20 行删除
... ... @@ -77,7 +77,7 @@ class SuppliersController extends BaseController
$param = [
'search'=>$this->param['search'],
];
$res = $this->_action($api_url,$action_name,$param);
$res = $this->_action($api_url,$action_name,$param ?? []);
$this->response('success',Code::SUCCESS,$res);
}
... ... @@ -110,11 +110,15 @@ class SuppliersController extends BaseController
$action_name = 'company_linked';
$param = [
'domain'=>$this->param['domain'],
'keyword'=>$this->param['keyword'],
'position'=>$this->param['position'],
'page'=>$this->page,
'page_size'=>$this->row,
];
if(isset($this->param['keyword'])){
$param['keyword'] = $this->param['keyword'];
}
if(isset($this->param['position'])){
$param['position'] = $this->param['position'];
}
$res = $this->_action($api_url,$action_name,$param);
$this->response('success',Code::SUCCESS,$res);
}
... ... @@ -130,7 +134,7 @@ class SuppliersController extends BaseController
$api_url = 'api/trade_trend';
$action_name = 'trade_trend';
$param = [
'prod_desc'=>$this->param['prod_desc'],
'prod_desc'=>$this->param['prod_desc'] ?? '',
];
$res = $this->_action($api_url,$action_name,$param);
$this->response('success',Code::SUCCESS,$res);
... ... @@ -147,9 +151,9 @@ class SuppliersController extends BaseController
$api_url = 'api/supplier_area';
$action_name = 'supplier_area';
$param = [
'prod_desc'=>$this->param['prod_desc'],
'start_date'=>$this->param['start_date'],
'end_date'=>$this->param['end_date'],
'prod_desc'=>$this->param['prod_desc'] ?? '',
'start_date'=>$this->param['start_date'] ?? '',
'end_date'=>$this->param['end_date'] ?? '',
];
$res = $this->_action($api_url,$action_name,$param);
$this->response('success',Code::SUCCESS,$res);
... ... @@ -166,8 +170,8 @@ class SuppliersController extends BaseController
$api_url = 'api/trade_partner';
$action_name = 'trade_partner';
$param = [
'com_id'=>$this->param['com_id'],
'com_role'=>$this->param['com_role'],
'com_id'=>$this->param['com_id'] ?? '',
'com_role'=>$this->param['com_role'] ?? '',
];
$res = $this->_action($api_url,$action_name,$param);
$this->response('success',Code::SUCCESS,$res);
... ... @@ -184,7 +188,7 @@ class SuppliersController extends BaseController
$api_url = 'api/trade_detail';
$action_name = 'trade_detail';
$param = [
'prod_desc'=>$this->param['prod_desc'],
'prod_desc'=>$this->param['prod_desc'] ?? '',
];
$res = $this->_action($api_url,$action_name,$param);
$this->response('success',Code::SUCCESS,$res);
... ... @@ -201,7 +205,7 @@ class SuppliersController extends BaseController
$api_url = 'api/bill_detail';
$action_name = 'bill_detail';
$param = [
'prod_desc'=>$this->param['prod_desc'],
'prod_desc'=>$this->param['prod_desc'] ?? '',
'page'=>$this->page,
'page_size'=>$this->row,
];
... ... @@ -220,8 +224,8 @@ class SuppliersController extends BaseController
$api_url = 'api/import_product';
$action_name = 'import_product';
$param = [
'com_id'=>$this->param['com_id'],
'com_role'=>$this->param['com_role'],
'com_id'=>$this->param['com_id'] ?? '',
'com_role'=>$this->param['com_role'] ?? '',
];
$res = $this->_action($api_url,$action_name,$param);
$this->response('success',Code::SUCCESS,$res);
... ...
... ... @@ -6,6 +6,7 @@ use App\Http\Logic\Bside\BaseLogic;
use App\Models\WebSetting\WebSettingReceiving;
use App\Models\WebSetting\WebSettingText;
use App\Services\SyncService;
use Illuminate\Support\Facades\DB;
class WebSettingReceivingLogic extends BaseLogic
{
... ... @@ -34,9 +35,18 @@ class WebSettingReceivingLogic extends BaseLogic
* @time :2023/5/8 16:26
*/
public function setting_receiving_save(){
$data = [];
DB::connection('custom_mysql')->beginTransaction();
try {
$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){
// 使用正则表达式匹配中国大陆手机号
$pattern = '/^1[3456789]\d{9}$/';
... ... @@ -47,11 +57,15 @@ class WebSettingReceivingLogic extends BaseLogic
$v['project_id'] = $this->user['project_id'];
$v['created_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){
$this->fail('error');
DB::connection('custom_mysql')->rollBack();
$this->fail('编辑失败，请联系管理员');
}
(new SyncService())->projectAcceptAddress($this->user['project_id']);
return $this->success();
... ...
... ... @@ -37,7 +37,7 @@ class WebSettingServiceLogic extends BaseLogic
* @time :2023/5/4 11:10
*/
public function setting_service_save(){
DB::beginTransaction();
DB::connection('custom_mysql')->beginTransaction();
try {
$this->param['data'] = Common::uniqueMultiArray($this->param['data']);
//删除以前的数据
... ... @@ -54,9 +54,9 @@ class WebSettingServiceLogic extends BaseLogic
if(!empty($data)){
$this->model->insert($data);
}
DB::commit();
DB::connection('custom_mysql')->commit();
}catch (\Exception $e){
DB::rollBack();
DB::connection('custom_mysql')->rollBack();
$this->fail('系统错误，请联系管理员');
}
return $this->success();
... ...