fnvtk/cunkebao_v3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码优化

Browse Source
This commit is contained in:
wong
2025-04-12 15:08:21 +08:00
parent 568de908e2
commit 9257716d9b
49 changed files with 1001 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Server/application/store/controller/BaseController.php
View File

@@ -35,10 +35,10 @@ class BaseController extends Api
$device = Cache::get($cacheKey);
// 如果缓存不存在，则从数据库获取
if (!$device) {
$device = Db::name('device_user')
$device = Db::table('ck_device_user')
->alias('du')
->join('device d', 'd.id = du.deviceId','left')
->join('wechat_account wa', 'd.id = wa.currentDeviceId','left')
->join('s2_device d', 'd.id = du.deviceId','left')
->join('s2_wechat_account wa', 'd.id = wa.currentDeviceId','left')
->where([
'du.userId' => $this->userInfo['id'],
'du.companyId' => $this->userInfo['companyId']

8
Server/application/store/controller/CustomerController.php
View File

@@ -54,11 +54,11 @@ class CustomerController extends Api
// }
// 构建查询
$query = Db::name('device_user')
$query = Db::table('ck_device_user')
->alias('du')
->join('device d', 'd.id = du.deviceId','left')
->join('wechat_account wa', 'wa.imei = d.imei','left')
->join('wechat_friend wf', 'wf.ownerWechatId = wa.wechatId','left')
->join('s2_device d', 'd.id = du.deviceId','left')
->join('s2_wechat_account wa', 'wa.imei = d.imei','left')
->join('s2_wechat_friend wf', 'wf.ownerWechatId = wa.wechatId','left')
->where($where)
->field('d.id as deviceId,d.imei,wf.*')
->group('wf.wechatId'); // 防止重复数据

2
Server/application/store/controller/SystemConfigController.php
View File

@@ -78,7 +78,7 @@ class SystemConfigController extends BaseController
// 更新数据库
$result = Db::name('device')
$result = Db::table('s2_device')
->where('id', $deviceId)
->update([
'taskConfig' => $taskConfig,

2
Server/application/store/model/FlowPackageModel.php
View File

@@ -6,7 +6,7 @@ use think\Model;
class FlowPackageModel extends Model
{
protected $name = 'flow_package';
protected $table = 'ck_flow_package';
// 定义字段自动转换
protected $type = [

2
Server/application/store/model/FlowPackageOrderModel.php
View File

@@ -10,7 +10,7 @@ use think\Model;
class FlowPackageOrderModel extends Model
{
// 设置表名
protected $name = 'flow_package_order';
protected $table = 'ck_flow_package_order';
// 自动写入时间戳
protected $autoWriteTimestamp = true;

2
Server/application/store/model/UserFlowPackageModel.php
View File

@@ -6,7 +6,7 @@ use think\Model;
class UserFlowPackageModel extends Model
{
protected $name = 'user_flow_package';
protected $table = 'ck_user_flow_package';
/**
* 获取用户当前有效的流量套餐
*

2
Server/application/store/model/WechatFriendModel.php
View File

@@ -6,6 +6,6 @@ use think\Model;
class WechatFriendModel extends Model
{
protected $name = 'wechat_friend';
protected $table = 'ck_wechat_friend';
}

2
Server/application/store/model/WechatMessageModel.php
View File

@@ -6,6 +6,6 @@ use think\Model;
class WechatMessageModel extends Model
{
protected $name = 'wechat_message';
protected $table = 'ck_wechat_message';
}