【程序目录】更新订阅消息

crmeb/app/adminapi/controller/v1/setting/SystemNotification.php

@@ -62,8 +62,8 @@ class SystemNotification extends AuthController
 
     /**
      * 保存新建的资源
-     *
-     * @return \think\Response
+     * @return mixed
+     * @throws \Psr\SimpleCache\InvalidArgumentException
      */
     public function save()
     {
@@ -92,6 +92,9 @@ class SystemNotification extends AuthController
         if (!$data['id']) return app('json')->fail(100100);
         if ($this->services->saveData($data)) {
             CacheService::delete('NOTICE_SMS_' . $data['mark']);
+            CacheService::delete('wechat_' . $data['mark']);
+            CacheService::delete('routine_' . $data['mark']);
+            CacheService::delete('TEMP_IDS_LIST');
             return app('json')->success(100001);
         } else {
             return app('json')->fail(100007);
@@ -100,15 +103,24 @@ class SystemNotification extends AuthController
 
     /**
      * 修改消息状态
-     *
-     * @return array
+     * @param $type
+     * @param $status
+     * @param $id
+     * @return mixed
+     * @throws \Psr\SimpleCache\InvalidArgumentException
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
      */
     public function set_status($type, $status, $id)
     {
         if ($type == '' || $status == '' || $id == 0) return app('json')->fail(100100);
         $this->services->update($id, [$type => $status]);
         $res = $this->services->getOneNotce(['id' => $id]);
-        CacheService::delete('NOTCE_' . $res->mark);
+        CacheService::delete('NOTICE_SMS_' . $res->mark);
+        CacheService::delete('wechat_' . $res->mark);
+        CacheService::delete('routine_' . $res->mark);
+        CacheService::delete('TEMP_IDS_LIST');
         return app('json')->success(100014);
     }
 }

crmeb/app/adminapi/controller/v1/system/SystemFile.php

@@ -43,6 +43,28 @@ class SystemFile extends AuthController
         return app('json')->success(['list' => $this->services->getFileList()]);
     }
 
+    /**
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     *
+     * @date 2022/09/07
+     * @author yyw
+     */
+    public function login()
+    {
+        [$password] = $this->request->postMore([
+            'password',
+        ], true);
+
+        $adminInfo = $this->request->adminInfo();
+        if (!$adminInfo) return app('json')->fail(100101);
+        if ($adminInfo['level'] != 0) return app('json')->fail(100101);
+
+        return app('json')->success($this->services->login($adminInfo['account'], $password, 'admin_edit'));
+    }
+
     //打开目录
     public function opendir()
     {

crmeb/app/adminapi/route/system.php

@@ -94,6 +94,8 @@ Route::group('system', function () {
     Route::get('upgrade_log/list', 'UpgradeController/upgradeLogList')->option(['real_name' => '升级记录']);
     //导出备份项目
     Route::get('upgrade_export/:id/:type', 'UpgradeController/export')->option(['real_name' => '导出备份']);
+
+    Route::post('file/login', 'v1.system.SystemFile/login')->option(['real_name' => '文件管理登录']);
 })->middleware([
     \app\http\middleware\AllowOriginMiddleware::class,
     \app\adminapi\middleware\AdminAuthTokenMiddleware::class,

crmeb/app/jobs/TemplateJob.php

@@ -56,10 +56,10 @@ class TemplateJob extends BaseJobs
                 }
                 $template->url($link);
             }
-
-            $tempid = CacheService::get('wechat_'.$tempCode, function () use ($type, $tempCode) {
-                //判断小程序还是公众号，获取数据id
-                $is_type = $type == 'wechat' ? 'is_wechat' : 'is_routine';
+            //判断小程序还是公众号，获取数据id
+            $is_type = $type == 'wechat' ? 'is_wechat' : 'is_routine';
+            $key = $is_type == 'is_wechat' ? 'wechat_' . $tempCode : 'routine_' . $tempCode;
+            $tempid = CacheService::get($key, function () use ($type, $tempCode, $is_type) {
                 /** @var SystemNotificationServices $notifyServices */
                 $notifyServices = app()->make(SystemNotificationServices::class);
                 return $notifyServices->getNotInfo(['type' => $is_type, 'mark' => $tempCode])['tempid'];

crmeb/app/listener/notice/Notice.php

@@ -75,8 +75,6 @@ class Notice implements ListenerInterface
                             $SystemMsg->sendMsg($data['spreadUid'], ['nickname' => $name]);
                             //模板消息公众号模版消息
                             $WechatTemplateList->sendBindSpreadUidSuccess($data['spreadUid'], $name);
-                            //模板消息小程序订阅消息
-                            $RoutineTemplateList->sendBindSpreadUidSuccess($data['spreadUid'], $name);
                         }
                         break;
                     //支付成功给用户
@@ -159,6 +157,7 @@ class Notice implements ListenerInterface
                     case 'price_revision':
                         $order = $data['order'];
                         $pay_price = $data['pay_price'];
+                        $order['storeName'] = $orderInfoServices->getCarIdByProductTitle($order['id'], $order['cart_id']);
                         //短信
                         $NoticeSms->sendSms($order['user_phone'], ['order_id' => $order['order_id'], 'pay_price' => $pay_price]);
                         //站内信
@@ -239,8 +238,6 @@ class Notice implements ListenerInterface
                         $SystemMsg->sendMsg($spread_uid, ['goods_name' => $goodsName, 'goods_price' => $goodsPrice, 'brokerage_price' => $brokeragePrice]);
                         //模板消息公众号模版消息
                         $WechatTemplateList->sendOrderBrokerageSuccess($spread_uid, $brokeragePrice, $add_time);
-                        //模板消息小程序订阅消息
-                        $RoutineTemplateList->sendOrderBrokerageSuccess($spread_uid, $brokeragePrice, $goodsName);
                         break;
                     //砍价成功
                     case 'bargain_success':
@@ -264,8 +261,6 @@ class Notice implements ListenerInterface
                         $SystemMsg->sendMsg($orderInfo['uid'], ['title' => $title, 'nickname' => $nickname, 'count' => $pink['people'], 'pink_time' => date('Y-m-d H:i:s', $pink['add_time'])]);
                         //模板消息公众号模版消息
                         $WechatTemplateList->sendOrderPinkOpenSuccess($orderInfo['uid'], $pink, $title);
-                        //模板消息小程序订阅消息
-                        $RoutineTemplateList->sendPinkSuccess($orderInfo['uid'], $title, $nickname, $pink['add_time'], $pink['people'], '/pages/users/order_details/index?order_id=' . $pink['order_id']);
                         break;
                     //参团成功
                     case 'can_pink_success':
@@ -277,8 +272,6 @@ class Notice implements ListenerInterface
                         $SystemMsg->sendMsg($orderInfo['uid'], ['title' => $title, 'nickname' => $nickname, 'count' => $pink['people'], 'pink_time' => date('Y-m-d H:i:s', $pink['add_time'])]);
                         //模板消息公众号模版消息
                         $WechatTemplateList->sendOrderPinkUseSuccess($orderInfo['uid'], $orderInfo, $title);
-                        //模板消息小程序订阅消息
-                        $RoutineTemplateList->sendPinkSuccess($orderInfo['uid'], $title, $nickname, $pink['add_time'], $pink['people'], '/pages/users/order_details/index?order_id=' . $pink['order_id']);
                         break;
                     //拼团成功
                     case 'order_user_groups_success':
@@ -300,8 +293,6 @@ class Notice implements ListenerInterface
                         $SystemMsg->sendMsg($uid, ['title' => $pink->title, 'count' => $pink->people]);
                         //模板消息公众号模版消息
                         $WechatTemplateList->sendOrderPinkClone($uid, $pink, $pink->title);
-                        //模板消息小程序订阅消息
-                        $RoutineTemplateList->sendPinkFail($uid, $pink->title, $pink->people, '亲，您的拼团取消，点击查看订单详情', '/pages/order_details/index?order_id=' . $pink->order_id);
                         break;
                     //拼团失败
                     case 'send_order_pink_fial':
@@ -311,8 +302,6 @@ class Notice implements ListenerInterface
                         $SystemMsg->sendMsg($uid, ['title' => $pink->title, 'count' => $pink->people]);
                         //模板消息公众号模版消息
                         $WechatTemplateList->sendOrderPinkFail($uid, $pink, $pink->title);
-                        //模板消息小程序订阅消息
-                        $RoutineTemplateList->sendPinkFail($uid, $pink->title, $pink->people, '亲，您拼团失败，自动为您申请退款，退款金额为：' . $pink->price, '/pages/order_details/index?order_id=' . $pink->order_id);
                         break;
                     //提现成功
                     case 'user_extract':

crmeb/app/services/message/notice/RoutineTemplateListService.php

@@ -91,7 +91,7 @@ class RoutineTemplateListService extends NoticeService
             'thing1' => $order['order_id'],
             'thing2' => $title,
             'date5' => date('Y-m-d H:i:s', time()),
-        ], '/pages/users/order_details/index?order_id=' . $order['order_id']);
+        ], '/pages/goods/order_details/index?order_id=' . $order['order_id']);
     }
 
     /**
@@ -110,14 +110,14 @@ class RoutineTemplateListService extends NoticeService
                 'thing1' => $order['delivery_name'],
                 'time3' => date('Y-m-d H:i:s', time()),
                 'thing5' => $storeTitle,
-            ], '/pages/users/order_details/index?order_id=' . $order['order_id']);
+            ], '/pages/goods/order_details/index?order_id=' . $order['order_id']);
         } else {//同城配送
             return $this->sendTemplate((int)$uid, [
                 'thing8' => $storeTitle,
                 'character_string1' => $order['order_id'],
                 'name4' => $order['delivery_name'],
                 'phone_number10' => $order['delivery_id']
-            ], '/pages/users/order_details/index?order_id=' . $order['order_id']);
+            ], '/pages/goods/order_details/index?order_id=' . $order['order_id']);
         }
     }
 
@@ -135,7 +135,7 @@ class RoutineTemplateListService extends NoticeService
             'amount3' => $UserRecharge['price'],
             'amount4' => $now_money,
             'date5' => date('Y-m-d H:i:s', time()),
-        ], '/pages/user_bill/index?type=2');
+        ], '/pages/users/user_bill/index?type=2');
     }
 
     /**
@@ -153,7 +153,7 @@ class RoutineTemplateListService extends NoticeService
             'thing2' => $storeTitle,
             'amount3' => $order['pay_price'],
             'character_string6' => $data['order_id']
-        ], '/pages/users/order_details/index?order_id=' . $data['order_id'] . '&isReturen=1');
+        ], '/pages/goods/order_details/index?order_id=' . $data['order_id'] . '&isReturen=1');
     }
 
     /**
@@ -170,7 +170,7 @@ class RoutineTemplateListService extends NoticeService
             'thing2' => $storeTitle,
             'amount3' => $order['pay_price'],
             'character_string6' => $order['order_id']
-        ], '/pages/users/order_details/index?order_id=' . $order['order_id'] . '&isReturen=1');
+        ], '/pages/goods/order_details/index?order_id=' . $order['order_id'] . '&isReturen=1');
     }
 
     /**
@@ -218,7 +218,7 @@ class RoutineTemplateListService extends NoticeService
         $data['character_string1'] = $orderId;
         $data['amount2'] = $pay_price . '元';
         $data['date3'] = date('Y-m-d H:i:s', time());
-        return $this->sendTemplate((int)$uid, $data, '/pages/users/order_details/index?order_id=' . $orderId);
+        return $this->sendTemplate((int)$uid, $data, '/pages/goods/order_details/index?order_id=' . $orderId);
     }
 
     /**
@@ -252,7 +252,7 @@ class RoutineTemplateListService extends NoticeService
             'amount2' => $extract_number . '元',
             'thing3' => $nickname,
             'date4' => date('Y-m-d H:i:s', time())
-        ], '/pages/users/user_spread_money/index?type=2');
+        ], '/pages/users/user_spread_money/index?type=1');
     }
 
     /**
@@ -269,7 +269,7 @@ class RoutineTemplateListService extends NoticeService
             'amount2' => $extract_number . '元',
             'thing3' => $nickname,
             'date4' => date('Y-m-d H:i:s', time())
-        ], '/pages/users/user_spread_money/index?type=2');
+        ], '/pages/users/user_spread_money/index?type=1');
     }
 
     /**

crmeb/app/services/wechat/RoutineServices.php

@@ -22,7 +22,6 @@ use app\services\user\UserServices;
 use app\services\user\UserVisitServices;
 use crmeb\exceptions\ApiException;
 use crmeb\services\CacheService;
-use crmeb\services\CacheService as Cache;
 use crmeb\services\app\MiniProgramService;
 use crmeb\services\oauth\OAuth;
 
@@ -130,7 +129,7 @@ class RoutineServices extends BaseServices
         $storeUserMobile = sys_config('store_user_mobile');
         if ($storeUserMobile && !$user) {
             $userInfoKey = md5($openid . '_' . time() . '_rouine');
-            Cache::setTokenBucket($userInfoKey, $createData, 7200);
+            CacheService::setTokenBucket($userInfoKey, $createData, 7200);
             return ['key' => $userInfoKey];
         } else if (!$user) {
             $user = $wechatUserServices->wechatOauthAfter($createData);
@@ -192,7 +191,7 @@ class RoutineServices extends BaseServices
      */
     public function tempIds()
     {
-        return Cache::get('TEMP_IDS_LIST', function () {
+        return CacheService::get('TEMP_IDS_LIST', function () {
             /** @var SystemNotificationServices $sysNotify */
             $sysNotify = app()->make(SystemNotificationServices::class);
             $marks = $sysNotify->getColumn([['routine_id', '>', 0]], 'routine_id', 'mark');
@@ -217,7 +216,7 @@ class RoutineServices extends BaseServices
      */
     public function live($page, $limit)
     {
-        $list = Cache::get('WECHAT_LIVE_LIST_' . $page . '_' . $limit, function () use ($page, $limit) {
+        $list = CacheService::get('WECHAT_LIVE_LIST_' . $page . '_' . $limit, function () use ($page, $limit) {
             $list = MiniProgramService::getLiveInfo((int)$page, (int)$limit);
             foreach ($list as &$item) {
                 $item['_start_time'] = date('m-d H:i', $item['start_time']);
@@ -262,7 +261,7 @@ class RoutineServices extends BaseServices
         $storeUserMobile = sys_config('store_user_mobile');
         if ($storeUserMobile && !$user) {
             $userInfoKey = md5($openid . '_' . time() . '_routine');
-            Cache::setTokenBucket($userInfoKey, $createData, 7200);
+            CacheService::setTokenBucket($userInfoKey, $createData, 7200);
             return ['key' => $userInfoKey];
         } else if (!$user) {
             //写入用户信息
@@ -320,7 +319,7 @@ class RoutineServices extends BaseServices
 
         if (!$user) {
             $userInfoKey = md5($openid . '_' . time() . '_routine');
-            Cache::setTokenBucket($userInfoKey, $createData, 7200);
+            CacheService::setTokenBucket($userInfoKey, $createData, 7200);
             return ['auth_login' => 1, 'key' => $userInfoKey];
         } else {
             //更新用户信息

crmeb/composer.lock

@@ -4882,5 +4882,5 @@
         "ext-mbstring": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }