github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-30 14:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

Browse Source
This commit is contained in:
liaofei 2023-04-10 11:08:58 +08:00
commit fe21773205
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crmeb/app/adminapi/controller/v1/setting/SystemCity.php
View File

@ -133,8 +133,9 @@ class SystemCity extends AuthController
*/
public function clean_cache()
{
$res = CacheService::delete('CITY_LIST');
if ($res) {
$res1 = CacheService::delete('CITY_LIST');
$res2 = CacheService::delete('CITY_FULL_LIST');
if ($res1 && $res2) {
return app('json')->success(400185);
} else {
return app('json')->fail(400186);
@ -150,6 +151,6 @@ class SystemCity extends AuthController
*/
public function fullList()
{
return app('json')->success($this->services->fullList());
return app('json')->success($this->services->fullList('parent_id,city_id,id,name,name as label,city_id as value'));
}
}

11
crmeb/app/services/shipping/SystemCityServices.php
View File

@ -28,7 +28,6 @@ use crmeb\services\FormBuilder as Form;
* @method update($id, array $data, ?string $key = null) 修改数据
* @method value(array $where, ?string $field = '') 获取一条数据
* @method getShippingCity() 获取运费模板城市数据
* @method fullList(?$field = '') 获取城市数据完整列表
*/
class SystemCityServices extends BaseServices
{
@ -153,4 +152,14 @@ class SystemCityServices extends BaseServices
}, 0);
}
/**
* 获取城市数据
* @return mixed
*/
public function fullList($field = '*')
{
return CacheService::remember('CITY_FULL_LIST', function () use ($field) {
return $this->dao->fullList($field);
}, 0);
}
}