周海龙 / globalso · 提交

转到一个项目

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

合并分支 'develop' 到 'master' 

Develop



查看合并请求 !417
内嵌 并排对比
正在显示 3 个修改的文件 包含 38 行增加 和 20 行删除
@@ -77,7 +77,7 @@ class SuppliersController extends BaseController @@ -77,7 +77,7 @@ class SuppliersController extends BaseController
77 $param = [ 77 $param = [
78 'search'=>$this->param['search'], 78 'search'=>$this->param['search'],
79 ]; 79 ];
80 - $res = $this->_action($api_url,$action_name,$param); 80 + $res = $this->_action($api_url,$action_name,$param ?? []);
81 $this->response('success',Code::SUCCESS,$res); 81 $this->response('success',Code::SUCCESS,$res);
82 } 82 }
83 83
@@ -110,11 +110,15 @@ class SuppliersController extends BaseController @@ -110,11 +110,15 @@ class SuppliersController extends BaseController
110 $action_name = 'company_linked'; 110 $action_name = 'company_linked';
111 $param = [ 111 $param = [
112 'domain'=>$this->param['domain'], 112 'domain'=>$this->param['domain'],
113 - 'keyword'=>$this->param['keyword'],  
114 - 'position'=>$this->param['position'],  
115 'page'=>$this->page, 113 'page'=>$this->page,
116 'page_size'=>$this->row, 114 'page_size'=>$this->row,
117 ]; 115 ];
  116 + if(isset($this->param['keyword'])){
  117 + $param['keyword'] = $this->param['keyword'];
  118 + }
  119 + if(isset($this->param['position'])){
  120 + $param['position'] = $this->param['position'];
  121 + }
118 $res = $this->_action($api_url,$action_name,$param); 122 $res = $this->_action($api_url,$action_name,$param);
119 $this->response('success',Code::SUCCESS,$res); 123 $this->response('success',Code::SUCCESS,$res);
120 } 124 }
@@ -130,7 +134,7 @@ class SuppliersController extends BaseController @@ -130,7 +134,7 @@ class SuppliersController extends BaseController
130 $api_url = 'api/trade_trend'; 134 $api_url = 'api/trade_trend';
131 $action_name = 'trade_trend'; 135 $action_name = 'trade_trend';
132 $param = [ 136 $param = [
133 - 'prod_desc'=>$this->param['prod_desc'], 137 + 'prod_desc'=>$this->param['prod_desc'] ?? '',
134 ]; 138 ];
135 $res = $this->_action($api_url,$action_name,$param); 139 $res = $this->_action($api_url,$action_name,$param);
136 $this->response('success',Code::SUCCESS,$res); 140 $this->response('success',Code::SUCCESS,$res);
@@ -147,9 +151,9 @@ class SuppliersController extends BaseController @@ -147,9 +151,9 @@ class SuppliersController extends BaseController
147 $api_url = 'api/supplier_area'; 151 $api_url = 'api/supplier_area';
148 $action_name = 'supplier_area'; 152 $action_name = 'supplier_area';
149 $param = [ 153 $param = [
150 - 'prod_desc'=>$this->param['prod_desc'],  
151 - 'start_date'=>$this->param['start_date'],  
152 - 'end_date'=>$this->param['end_date'], 154 + 'prod_desc'=>$this->param['prod_desc'] ?? '',
  155 + 'start_date'=>$this->param['start_date'] ?? '',
  156 + 'end_date'=>$this->param['end_date'] ?? '',
153 ]; 157 ];
154 $res = $this->_action($api_url,$action_name,$param); 158 $res = $this->_action($api_url,$action_name,$param);
155 $this->response('success',Code::SUCCESS,$res); 159 $this->response('success',Code::SUCCESS,$res);
@@ -166,8 +170,8 @@ class SuppliersController extends BaseController @@ -166,8 +170,8 @@ class SuppliersController extends BaseController
166 $api_url = 'api/trade_partner'; 170 $api_url = 'api/trade_partner';
167 $action_name = 'trade_partner'; 171 $action_name = 'trade_partner';
168 $param = [ 172 $param = [
169 - 'com_id'=>$this->param['com_id'],  
170 - 'com_role'=>$this->param['com_role'], 173 + 'com_id'=>$this->param['com_id'] ?? '',
  174 + 'com_role'=>$this->param['com_role'] ?? '',
171 ]; 175 ];
172 $res = $this->_action($api_url,$action_name,$param); 176 $res = $this->_action($api_url,$action_name,$param);
173 $this->response('success',Code::SUCCESS,$res); 177 $this->response('success',Code::SUCCESS,$res);
@@ -184,7 +188,7 @@ class SuppliersController extends BaseController @@ -184,7 +188,7 @@ class SuppliersController extends BaseController
184 $api_url = 'api/trade_detail'; 188 $api_url = 'api/trade_detail';
185 $action_name = 'trade_detail'; 189 $action_name = 'trade_detail';
186 $param = [ 190 $param = [
187 - 'prod_desc'=>$this->param['prod_desc'], 191 + 'prod_desc'=>$this->param['prod_desc'] ?? '',
188 ]; 192 ];
189 $res = $this->_action($api_url,$action_name,$param); 193 $res = $this->_action($api_url,$action_name,$param);
190 $this->response('success',Code::SUCCESS,$res); 194 $this->response('success',Code::SUCCESS,$res);
@@ -201,7 +205,7 @@ class SuppliersController extends BaseController @@ -201,7 +205,7 @@ class SuppliersController extends BaseController
201 $api_url = 'api/bill_detail'; 205 $api_url = 'api/bill_detail';
202 $action_name = 'bill_detail'; 206 $action_name = 'bill_detail';
203 $param = [ 207 $param = [
204 - 'prod_desc'=>$this->param['prod_desc'], 208 + 'prod_desc'=>$this->param['prod_desc'] ?? '',
205 'page'=>$this->page, 209 'page'=>$this->page,
206 'page_size'=>$this->row, 210 'page_size'=>$this->row,
207 ]; 211 ];
@@ -220,8 +224,8 @@ class SuppliersController extends BaseController @@ -220,8 +224,8 @@ class SuppliersController extends BaseController
220 $api_url = 'api/import_product'; 224 $api_url = 'api/import_product';
221 $action_name = 'import_product'; 225 $action_name = 'import_product';
222 $param = [ 226 $param = [
223 - 'com_id'=>$this->param['com_id'],  
224 - 'com_role'=>$this->param['com_role'], 227 + 'com_id'=>$this->param['com_id'] ?? '',
  228 + 'com_role'=>$this->param['com_role'] ?? '',
225 ]; 229 ];
226 $res = $this->_action($api_url,$action_name,$param); 230 $res = $this->_action($api_url,$action_name,$param);
227 $this->response('success',Code::SUCCESS,$res); 231 $this->response('success',Code::SUCCESS,$res);
@@ -6,6 +6,7 @@ use App\Http\Logic\Bside\BaseLogic; @@ -6,6 +6,7 @@ use App\Http\Logic\Bside\BaseLogic;
6 use App\Models\WebSetting\WebSettingReceiving; 6 use App\Models\WebSetting\WebSettingReceiving;
7 use App\Models\WebSetting\WebSettingText; 7 use App\Models\WebSetting\WebSettingText;
8 use App\Services\SyncService; 8 use App\Services\SyncService;
  9 +use Illuminate\Support\Facades\DB;
9 10
10 class WebSettingReceivingLogic extends BaseLogic 11 class WebSettingReceivingLogic extends BaseLogic
11 { 12 {
@@ -34,9 +35,18 @@ class WebSettingReceivingLogic extends BaseLogic @@ -34,9 +35,18 @@ class WebSettingReceivingLogic extends BaseLogic
34 * @time :2023/5/8 16:26 35 * @time :2023/5/8 16:26
35 */ 36 */
36 public function setting_receiving_save(){ 37 public function setting_receiving_save(){
  38 + $data = [];
  39 + DB::connection('custom_mysql')->beginTransaction();
37 try { 40 try {
38 $this->model->del(['project_id'=>$this->user['project_id']]); 41 $this->model->del(['project_id'=>$this->user['project_id']]);
39 - foreach ($this->param['data'] as $k => $v){ 42 + foreach ($this->param['data'] as $v){
  43 + if($v['type'] == 1){
  44 + // 使用正则表达式匹配中国大陆手机号
  45 + $pattern = '/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/';
  46 + if (!preg_match($pattern, $v['values'])) {
  47 + continue;
  48 + }
  49 + }
40 if($v['type'] == 2){ 50 if($v['type'] == 2){
41 // 使用正则表达式匹配中国大陆手机号 51 // 使用正则表达式匹配中国大陆手机号
42 $pattern = '/^1[3456789]\d{9}$/'; 52 $pattern = '/^1[3456789]\d{9}$/';
@@ -47,11 +57,15 @@ class WebSettingReceivingLogic extends BaseLogic @@ -47,11 +57,15 @@ class WebSettingReceivingLogic extends BaseLogic
47 $v['project_id'] = $this->user['project_id']; 57 $v['project_id'] = $this->user['project_id'];
48 $v['created_at'] = date('Y-m-d H:i:s'); 58 $v['created_at'] = date('Y-m-d H:i:s');
49 $v['updated_at'] = date('Y-m-d H:i:s'); 59 $v['updated_at'] = date('Y-m-d H:i:s');
50 - $this->param['data'][$k] = $v; 60 + $data[] = $v;
  61 + }
  62 + if(!empty($data)){
  63 + $this->model->insert($data);
51 } 64 }
52 - $this->model->insert($this->param['data']); 65 + DB::connection('custom_mysql')->commit();
53 }catch (\Exception $e){ 66 }catch (\Exception $e){
54 - $this->fail('error'); 67 + DB::connection('custom_mysql')->rollBack();
  68 + $this->fail('编辑失败，请联系管理员');
55 } 69 }
56 (new SyncService())->projectAcceptAddress($this->user['project_id']); 70 (new SyncService())->projectAcceptAddress($this->user['project_id']);
57 return $this->success(); 71 return $this->success();
@@ -37,7 +37,7 @@ class WebSettingServiceLogic extends BaseLogic @@ -37,7 +37,7 @@ class WebSettingServiceLogic extends BaseLogic
37 * @time :2023/5/4 11:10 37 * @time :2023/5/4 11:10
38 */ 38 */
39 public function setting_service_save(){ 39 public function setting_service_save(){
40 - DB::beginTransaction(); 40 + DB::connection('custom_mysql')->beginTransaction();
41 try { 41 try {
42 $this->param['data'] = Common::uniqueMultiArray($this->param['data']); 42 $this->param['data'] = Common::uniqueMultiArray($this->param['data']);
43 //删除以前的数据 43 //删除以前的数据
@@ -54,9 +54,9 @@ class WebSettingServiceLogic extends BaseLogic @@ -54,9 +54,9 @@ class WebSettingServiceLogic extends BaseLogic
54 if(!empty($data)){ 54 if(!empty($data)){
55 $this->model->insert($data); 55 $this->model->insert($data);
56 } 56 }
57 - DB::commit(); 57 + DB::connection('custom_mysql')->commit();
58 }catch (\Exception $e){ 58 }catch (\Exception $e){
59 - DB::rollBack(); 59 + DB::connection('custom_mysql')->rollBack();
60 $this->fail('系统错误，请联系管理员'); 60 $this->fail('系统错误，请联系管理员');
61 } 61 }
62 return $this->success(); 62 return $this->success();