From bbc4c92094d074da5fe2cec66c2f6a28f62ed7b1 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Tue, 16 May 2023 15:46:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=94=80=E7=94=A8=E6=88=B7=E5=90=8C?=
 =?UTF-8?q?=E6=97=B6=E5=88=A0=E9=99=A4=E5=AE=A2=E6=9C=8D=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E5=81=9C=E6=AD=A2=E6=AD=A4=E7=94=A8=E6=88=B7=E7=9A=84=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E7=9A=84=E5=8F=91=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../notice/WechatTemplateListService.php        | 17 ++++++++++++-----
 crmeb/app/services/user/UserCancelServices.php  |  5 +++++
 crmeb/app/services/wechat/RoutineServices.php   |  2 +-
 .../app/services/wechat/WechatUserServices.php  |  2 +-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/crmeb/app/services/message/notice/WechatTemplateListService.php b/crmeb/app/services/message/notice/WechatTemplateListService.php
index 40ccc4468..b70a144f6 100644
--- a/crmeb/app/services/message/notice/WechatTemplateListService.php
+++ b/crmeb/app/services/message/notice/WechatTemplateListService.php
@@ -14,6 +14,7 @@ namespace app\services\message\notice;
 use app\jobs\TemplateJob;
 use app\services\message\NoticeService;
 use app\services\kefu\service\StoreServiceServices;
+use app\services\user\UserServices;
 use app\services\wechat\WechatUserServices;
 use think\facade\Log;
 
@@ -52,9 +53,13 @@ class WechatTemplateListService extends NoticeService
      */
     public function getOpenidByUid(int $uid)
     {
-        /** @var WechatUserServices $wechatServices */
-        $wechatServices = app()->make(WechatUserServices::class);
-        return $wechatServices->uidToOpenid($uid, 'wechat');
+        $isDel = app()->make(UserServices::class)->value(['uid' => $uid], 'is_del');
+        if ($isDel) {
+            $openid = '';
+        } else {
+            $openid = app()->make(WechatUserServices::class)->uidToOpenid($uid, 'wechat');
+        }
+        return $openid;
     }
 
     /**
@@ -71,8 +76,10 @@ class WechatTemplateListService extends NoticeService
             $this->isOpen = $this->noticeInfo['is_wechat'] === 1;
             if ($this->isOpen) {
                 $openid = $this->getOpenidByUid($uid);
-                //放入队列执行
-                TemplateJob::dispatch('doJob', ['wechat', $openid, $this->noticeInfo['mark'], $data, $link, $color]);
+                if ($openid != '') {
+                    //放入队列执行
+                    TemplateJob::dispatch('doJob', ['wechat', $openid, $this->noticeInfo['mark'], $data, $link, $color]);
+                }
             }
         } catch (\Exception $e) {
             Log::error($e->getMessage());
diff --git a/crmeb/app/services/user/UserCancelServices.php b/crmeb/app/services/user/UserCancelServices.php
index ad17879ff..12d5e78d1 100644
--- a/crmeb/app/services/user/UserCancelServices.php
+++ b/crmeb/app/services/user/UserCancelServices.php
@@ -4,6 +4,7 @@ namespace app\services\user;
 
 use app\dao\user\UserCancelDao;
 use app\services\BaseServices;
+use app\services\kefu\service\StoreServiceServices;
 use app\services\wechat\WechatUserServices;
 use crmeb\services\CacheService;
 
@@ -31,9 +32,13 @@ class UserCancelServices extends BaseServices
         $userServices = app()->make(UserServices::class);
         /** @var WechatUserServices $wechatUserServices */
         $wechatUserServices = app()->make(WechatUserServices::class);
+        /** @var StoreServiceServices $ServiceServices */
+        $ServiceServices = app()->make(StoreServiceServices::class);
         $userServices->update($uid, ['is_del' => 1]);
         $userServices->update(['spread_uid' => $uid], ['spread_uid' => 0, 'spread_time' => 0]);
         $wechatUserServices->update(['uid' => $uid], ['is_del' => 1]);
+        $ServiceServices->delete(['uid' => $uid]);
+        return true;
     }
 
     /**
diff --git a/crmeb/app/services/wechat/RoutineServices.php b/crmeb/app/services/wechat/RoutineServices.php
index 4897cd8d6..ca4b7bb98 100644
--- a/crmeb/app/services/wechat/RoutineServices.php
+++ b/crmeb/app/services/wechat/RoutineServices.php
@@ -479,7 +479,7 @@ class RoutineServices extends BaseServices
         if (!$userInfo || !isset($userInfo['purePhoneNumber'])) {
             throw new ApiException(410079);
         }
-        $uid = app()->make(WechatUserServices::class)->openidTouid($userInfoCong['openid']);
+        $uid = app()->make(WechatUserServices::class)->openidToUid($userInfoCong['openid']);
         $userServices = app()->make(UserServices::class);
         if ($userServices->count(['phone' => $userInfo['purePhoneNumber']])) {
             throw new ApiException(410028);
diff --git a/crmeb/app/services/wechat/WechatUserServices.php b/crmeb/app/services/wechat/WechatUserServices.php
index 59be45e76..3702f49d4 100644
--- a/crmeb/app/services/wechat/WechatUserServices.php
+++ b/crmeb/app/services/wechat/WechatUserServices.php
@@ -83,7 +83,7 @@ class WechatUserServices extends BaseServices
      * @param string $openidType
      * @return mixed
      */
-    public function openidTouid($openid, $openidType = 'openid')
+    public function openidToUid($openid, string $openidType = 'openid')
     {
         $uid = $this->dao->value([[$openidType, '=', $openid], ['user_type', '<>', 'h5']], 'uid');
         if (!$uid)