底层代码优化及用户管理
This commit is contained in:
@@ -74,7 +74,7 @@ class DeviceController extends BaseController
|
||||
private function saveDevice($item)
|
||||
{
|
||||
$data = [
|
||||
'deviceId' => isset($item['id']) ? $item['id'] : '',
|
||||
'id' => isset($item['id']) ? $item['id'] : '',
|
||||
'userName' => isset($item['userName']) ? $item['userName'] : '',
|
||||
'nickname' => isset($item['nickname']) ? $item['nickname'] : '',
|
||||
'realName' => isset($item['realName']) ? $item['realName'] : '',
|
||||
@@ -103,11 +103,25 @@ class DeviceController extends BaseController
|
||||
];
|
||||
|
||||
// 使用imei作为唯一性判断
|
||||
$device = DeviceModel::where('imei', $item['imei'])->find();
|
||||
$device = DeviceModel::where('id', $item['id'])->find();
|
||||
|
||||
if ($device) {
|
||||
$device->save($data);
|
||||
} else {
|
||||
|
||||
// autoLike:自动点赞
|
||||
// momentsSync:朋友圈同步
|
||||
// autoCustomerDev:自动开发客户
|
||||
// groupMessageDeliver:群消息推送
|
||||
// autoGroup:自动建群
|
||||
|
||||
$data['taskConfig'] = json_encode([
|
||||
'autoLike' => true,
|
||||
'momentsSync' => true,
|
||||
'autoCustomerDev' => true,
|
||||
'groupMessageDeliver' => true,
|
||||
'autoGroup' => true,
|
||||
]);
|
||||
DeviceModel::create($data);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -112,7 +112,7 @@ class FriendTaskController extends BaseController
|
||||
$createTime = isset($item['createTime']) ? strtotime($item['createTime']) : null;
|
||||
|
||||
$data = [
|
||||
'taskId' => $item['id'],
|
||||
'id' => $item['id'],
|
||||
'tenantId' => $item['tenantId'],
|
||||
'operatorAccountId' => $item['operatorAccountId'],
|
||||
'status' => $item['status'],
|
||||
@@ -134,7 +134,7 @@ class FriendTaskController extends BaseController
|
||||
];
|
||||
|
||||
// 使用taskId作为唯一性判断
|
||||
$task = FriendTaskModel::where('taskId', $item['id'])->find();
|
||||
$task = FriendTaskModel::where('id', $item['id'])->find();
|
||||
|
||||
if ($task) {
|
||||
$task->save($data);
|
||||
|
||||
@@ -13,6 +13,7 @@ class WechatController extends BaseController
|
||||
private function saveWechatAccount($item)
|
||||
{
|
||||
$data = [
|
||||
'id' => $item['id'],
|
||||
'wechatId' => $item['wechatId'],
|
||||
'deviceAccountId' => $item['deviceAccountId'],
|
||||
'imei' => $item['imei'],
|
||||
@@ -49,7 +50,7 @@ class WechatController extends BaseController
|
||||
'labels' => $item['labels']
|
||||
];
|
||||
|
||||
$account = WechatAccountModel::where('wechatId', $item['wechatId'])->find();
|
||||
$account = WechatAccountModel::where('id', $item['id'])->find();
|
||||
if ($account) {
|
||||
$account->save($data);
|
||||
} else {
|
||||
|
||||
@@ -68,6 +68,7 @@ class WechatFriendController extends BaseController
|
||||
private function saveFriend($item)
|
||||
{
|
||||
$data = [
|
||||
'id' => $item['id'],
|
||||
'wechatAccountId' => $item['wechatAccountId'],
|
||||
'alias' => $item['alias'],
|
||||
'wechatId' => $item['wechatId'],
|
||||
@@ -106,11 +107,7 @@ class WechatFriendController extends BaseController
|
||||
];
|
||||
|
||||
// 使用三个字段的组合作为唯一性判断
|
||||
$friend = WechatFriendModel::where([
|
||||
['ownerWechatId', '=', $item['ownerWechatId']],
|
||||
['wechatId', '=', $item['wechatId']],
|
||||
['wechatAccountId', '=', $item['wechatAccountId']]
|
||||
])->find();
|
||||
$friend = WechatFriendModel::where('id',$item['id'])->find();
|
||||
|
||||
if ($friend) {
|
||||
$friend->save($data);
|
||||
|
||||
Reference in New Issue
Block a user