From 9cb1bb61202336fa205ebe4e9b0aaa3ca8a93638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Tue, 23 Aug 2022 17:39:11 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E3=80=91=E4=BC=98=E5=8C=96=E6=B8=85=E9=99=A4=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/v1/system/SystemClearData.php | 17 +++++++++++++---- .../app/services/agent/AgentManageServices.php | 3 +++ .../agent/DivisionAgentApplyServices.php | 4 +++- .../kefu/service/StoreServiceServices.php | 5 +++++ crmeb/app/services/user/LoginServices.php | 6 ++++++ crmeb/app/services/user/UserServices.php | 9 ++++++++- 6 files changed, 38 insertions(+), 6 deletions(-) diff --git a/crmeb/app/adminapi/controller/v1/system/SystemClearData.php b/crmeb/app/adminapi/controller/v1/system/SystemClearData.php index c70798b35..7a41b6a48 100644 --- a/crmeb/app/adminapi/controller/v1/system/SystemClearData.php +++ b/crmeb/app/adminapi/controller/v1/system/SystemClearData.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | CRMEB [ CRMEB赋能开发者，助力企业发展 ] // +---------------------------------------------------------------------- -// | Copyright (c) 2016~2020 https://www.crmeb.com All rights reserved. +// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. // +---------------------------------------------------------------------- // | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 // +---------------------------------------------------------------------- @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\adminapi\controller\v1\system; + use think\facade\App; use app\adminapi\controller\AuthController; use app\services\system\SystemClearServices; @@ -39,6 +40,7 @@ class SystemClearData extends AuthController /** * 统一方法 * @param $type + * @return mixed */ public function index($type) { @@ -86,18 +88,25 @@ class SystemClearData extends AuthController /** * 清除用户生成的临时附件 - * @param int $type - * @throws \Exception + * @return mixed */ public function userTemp() { /** @var SystemAttachmentServices $services */ $services = app()->make(SystemAttachmentServices::class); + $imageUrl = $services->getColumn(['module_type' => 2], 'att_dir'); + foreach ($imageUrl as $item) { + @unlink(app()->getRootPath() . 'public' . $item); + } $services->delete(2, 'module_type'); + $this->services->clearData(['qrcode'], true); return app('json')->success(100046); } - //清除回收站商品 + /** + * 清除回收站商品 + * @return mixed + */ public function recycleProduct() { /** @var StoreProductServices $services */ diff --git a/crmeb/app/services/agent/AgentManageServices.php b/crmeb/app/services/agent/AgentManageServices.php index 9405c3477..9a6a51d98 100644 --- a/crmeb/app/services/agent/AgentManageServices.php +++ b/crmeb/app/services/agent/AgentManageServices.php @@ -68,6 +68,9 @@ class AgentManageServices extends BaseServices $item['new_money'] = 0; $item['brokerage_money'] = $item['brokerage_price']; unset($item['extract'], $item['order'], $item['bill'], $item['spreadUser'], $item['spreadCount']); + if (strpos($item['headimgurl'], '/statics/system_images/') !== false) { + $item['headimgurl'] = set_file_url($item['headimgurl']); + } } return $data; } diff --git a/crmeb/app/services/agent/DivisionAgentApplyServices.php b/crmeb/app/services/agent/DivisionAgentApplyServices.php index 9e5939a06..cee03a280 100644 --- a/crmeb/app/services/agent/DivisionAgentApplyServices.php +++ b/crmeb/app/services/agent/DivisionAgentApplyServices.php @@ -152,7 +152,9 @@ class DivisionAgentApplyServices extends BaseServices 'is_staff' => 0, 'division_percent' => $data['division_percent'], 'division_change_time' => time(), - 'division_end_time' => strtotime($data['division_end_time']) + 'division_end_time' => strtotime($data['division_end_time']), + 'spread_uid' => $applyInfo['division_id'], + 'spread_time' => time() ]; /** @var UserServices $userServices */ $userServices = app()->make(UserServices::class); diff --git a/crmeb/app/services/kefu/service/StoreServiceServices.php b/crmeb/app/services/kefu/service/StoreServiceServices.php index 778fa97ce..9fc4f9f33 100644 --- a/crmeb/app/services/kefu/service/StoreServiceServices.php +++ b/crmeb/app/services/kefu/service/StoreServiceServices.php @@ -58,6 +58,11 @@ class StoreServiceServices extends BaseServices { [$page, $limit] = $this->getPageValue(); $list = $this->dao->getServiceList($where, $page, $limit); + foreach ($list as &$item) { + if (strpos($item['avatar'], '/statics/system_images/') !== false) { + $item['avatar'] = set_file_url($item['avatar']); + } + } $this->updateNonExistentService(array_column($list, 'uid')); $count = $this->dao->count($where); return compact('list', 'count'); diff --git a/crmeb/app/services/user/LoginServices.php b/crmeb/app/services/user/LoginServices.php index 2e1a7c0db..075732111 100644 --- a/crmeb/app/services/user/LoginServices.php +++ b/crmeb/app/services/user/LoginServices.php @@ -207,6 +207,12 @@ class LoginServices extends BaseServices if ($spread) { $data['spread_uid'] = $spread; $data['spread_time'] = time(); + /** @var UserServices $userServices */ + $userServices = app()->make(UserServices::class); + $spreadInfo = $userServices->get($spread); + $data['division_id'] = $spreadInfo['division_id']; + $data['agent_id'] = $spreadInfo['agent_id']; + $data['staff_id'] = $spreadInfo['staff_id']; } $data['real_name'] = ''; $data['birthday'] = 0; diff --git a/crmeb/app/services/user/UserServices.php b/crmeb/app/services/user/UserServices.php index 5d8528682..bf050d27e 100644 --- a/crmeb/app/services/user/UserServices.php +++ b/crmeb/app/services/user/UserServices.php @@ -1609,7 +1609,14 @@ class UserServices extends BaseServices //记录上下级关系 if (!$userInfo['spread_uid'] && $spreadUid != $uid && $userSpreadUid != $userInfo['uid']) { if ((sys_config('brokerage_bindind') == 2 && $userInfo['add_time'] == $userInfo['last_time']) || sys_config('brokerage_bindind') == 1) { - if (!$this->dao->update($uid, ['spread_uid' => $spreadUid, 'spread_time' => time()], 'uid')) { + $spreadInfo = $this->dao->get($spreadUid); + $data = []; + $data['spread_uid'] = $spreadUid; + $data['spread_time'] = time(); + $data['division_id'] = $spreadInfo['division_id']; + $data['agent_id'] = $spreadInfo['agent_id']; + $data['staff_id'] = $spreadInfo['staff_id']; + if (!$this->dao->update($uid, $data, 'uid')) { throw new ApiException(410288); } /** @var UserBillServices $userBill */