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

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"
 }

crmeb/public/install/crmeb.sql

@@ -33561,28 +33561,28 @@ CREATE TABLE IF NOT EXISTS `eb_system_notification` (
 --
 
 INSERT INTO `eb_system_notification` (`id`, `mark`, `name`, `title`, `is_system`, `is_app`, `is_wechat`, `is_routine`, `is_sms`, `is_ent_wechat`, `system_title`, `system_text`, `app_id`, `sms_id`, `sms_text`, `wechat_id`, `routine_id`, `ent_wechat_text`, `variable`, `url`, `type`, `add_time`) VALUES
-(1, 'bind_spread_uid', '绑定推广关系', '注册完成给上级发送', 1, 0, 1, 1, 0, 0, '绑定下级通知', '恭喜，又一员猛将将永久绑定到您的团队，用户{nickname}加入您的队伍！', 0, '0', '', 31, 4, '0', '{nikename}用户名', '', 1, 0),
+(1, 'bind_spread_uid', '绑定推广关系', '注册完成给上级发送', 1, 0, 1, 0, 0, 0, '绑定下级通知', '恭喜，又一员猛将将永久绑定到您的团队，用户{nickname}加入您的队伍！', 0, '0', '', 31, 4, '0', '{nikename}用户名', '', 1, 0),
 (2, 'order_pay_success', '支付成功给用户发送', '支付成功给用户发送', 1, 0, 1, 1, 2, 0, '购买成功通知', '您购买的商品已支付成功，支付金额{pay_price}元，订单号{order_id},感谢您的光临！', 0, '520268', '您购买的商品已支付成功，支付金额{$pay_price}元，订单号{$order_id},感谢您的光临！', 26, 12, '0', '{order_id}订单号,{total_num}商品总数,{pay_price}支付金额', '', 1, 0),
 (3, 'order_take', '确认收货提醒发送', '确认收货用户提醒发送', 1, 0, 1, 1, 2, 0, '确认收货通知', '亲，您的订单{order_id},商品{store_name}已确认收货,感谢您的光临！', 0, '520271', '亲，您的订单{$order_id},商品{$store_name}已确认收货,感谢您的光临！', 17, 3, '0', '{order_id}订单号,{store_name}商品名称', '', 1, 0),
 (4, 'price_revision', '改价提醒发送', '改价给用户提醒发送', 1, 0, 1, 0, 2, 0, '改价通知', '您的订单{order_id}，实际支付金额已被修改为{pay_price}', 0, '528288', '您的订单{$order_id}，实际支付金额已被修改为{$pay_price}', 36, 0, '0', '{order_id}订单号,{pay_price}订单金额', '', 1, 0),
 (5, 'order_refund', '退款成功提醒发送', '退款给用户提醒发送', 1, 0, 1, 1, 0, 0, '退款成功通知', '您的订单{order_id}已同意退款,退款金额{refund_price}元。', 0, '0', '', 18, 10, '0', '{order_id}订单号,{refund_price}退款金额,{pay_price}订单金额', '', 1, 0),
 (7, 'recharge_success', '充值成功提醒发送', '充值成功给用户提醒发送', 1, 0, 1, 1, 0, 0, '充值成功通知', '您成功充值￥{price}，现剩余余额￥{now_money}元', 0, '0', '', 37, 11, '0', '{order_id}充值订单,{price}充值金额,{now_money}现有余额', '', 1, 0),
 (8, 'integral_accout', '积分到账提醒发送', '积分到账给用户提醒发送', 1, 0, 1, 1, 0, 0, '积分到账通知', '亲，您成功获得积分{gain_integral}，现有积分{integral}', 0, '0', '', 41, 14, '0', '{order_id}订单号,{store_name}商品名称,{pay_price}支付金额,{gain_integral}获取积分,{integral}现有积分', '', 1, 0),
-(9, 'order_brokerage', '佣金到账提醒发送', '佣金到账给用户提醒发送', 1, 0, 1, 1, 0, 0, '佣金到账通知', '亲，恭喜您成功获得佣金{brokerage_price}元', 0, '0', '', 30, 1, '0', '{goods_name}商品名称,{goods_price}商品金额,{brokerage_price}分佣金额', '', 1, 0),
+(9, 'order_brokerage', '佣金到账提醒发送', '佣金到账给用户提醒发送', 1, 0, 1, 0, 0, 0, '佣金到账通知', '亲，恭喜您成功获得佣金{brokerage_price}元', 0, '0', '', 30, 1, '0', '{goods_name}商品名称,{goods_price}商品金额,{brokerage_price}分佣金额', '', 1, 0),
 (10, 'bargain_success', '砍价成功提醒发送', '砍价成功给用户提醒发送', 1, 0, 1, 1, 0, 0, '砍价成功通知', '亲，好腻害！你的朋友们已经帮你砍到底价了，商品名称{title}，底价{min_price}', 0, '0', '', 27, 7, '0', '{title}活动名称{min_price}最低价', '', 1, 0),
 (11, 'order_user_groups_success', '拼团成功提醒发送', '拼团成功给用户提醒发送', 1, 0, 1, 1, 0, 0, '拼团成功通知', '亲，您的拼团已经完成了，拼团名称{title}，团长{nickname}', 0, '0', '', 23, 6, '0', '{title}活动名称,{nickname}团长,{count}拼团人数,{pink_time}开团时间', '', 1, 0),
-(12, 'send_order_pink_fial', '拼团失败提醒发送', '拼团失败给用户提醒发送', 1, 0, 1, 1, 0, 0, '拼团失败通知', '亲，您的拼团失败，活动名称{title}', 0, '0', '', 24, 15, '0', '{title}活动名称{count}拼团人数', '', 1, 0),
-(13, 'open_pink_success', '开团成功提醒发送', '开团成功给用户提醒发送', 1, 0, 1, 1, 0, 0, '开团成功通知', '亲，您已成功参与拼团，活动名称{title}', 0, '0', '', 28, 6, '0', '{title}活动名称,{nickname}团长,{count}拼团人数,{pink_time}开团时间', '', 1, 0),
+(12, 'send_order_pink_fial', '拼团失败提醒发送', '拼团失败给用户提醒发送', 1, 0, 1, 0, 0, 0, '拼团失败通知', '亲，您的拼团失败，活动名称{title}', 0, '0', '', 24, 15, '0', '{title}活动名称{count}拼团人数', '', 1, 0),
+(13, 'open_pink_success', '开团成功提醒发送', '开团成功给用户提醒发送', 1, 0, 1, 0, 0, 0, '开团成功通知', '亲，您已成功参与拼团，活动名称{title}', 0, '0', '', 28, 6, '0', '{title}活动名称,{nickname}团长,{count}拼团人数,{pink_time}开团时间', '', 1, 0),
 (14, 'user_extract', '提现成功提醒发送', '提现成功给用户提醒发送', 1, 0, 1, 1, 0, 0, '提现成功通知', '亲，您成功提现佣金{extract_number}元', 0, '0', '', 38, 2, '0', '{extract_number}提现金额,{nickname}用户昵称,{date}提现时间', '', 1, 0),
 (15, 'user_balance_change', '提现失败提醒发送', '提现失败给用户提醒发送', 1, 0, 1, 1, 0, 0, '提现失败通知', '亲，您发起的提现被驳回，返回佣金{extract_number}元', 0, '0', '', 39, 2, '0', '{extract_number}提现金额,{nickname}用户昵称,{date}提现时间,{message}失败原因', '', 1, 0),
 (16, 'recharge_order_refund_status', '充值退款提醒发送', '充值退款给用户提醒发送', 1, 0, 1, 1, 0, 0, '充值退款通知', '亲，您充值的金额已退款,本次退款{refund_price}元', 0, '0', '', 18, 11, '0', '{refund_price}退款金额,{order_id}充值订单,{price}充值金额', '', 1, 0),
 (17, 'send_order_refund_no_status', '退款申请未通过提醒发送', '退款申请未通过给用户提醒发送', 1, 0, 1, 1, 0, 0, '退款申请拒绝通知', '您好！您的订单{order_id}已拒绝退款。', 0, '0', '', 18, 10, '0', '{order_id}订单号,{store_name}商品名称,{pay_price}订单金额', '', 1, 0),
 (18, 'send_order_apply_refund', '申请退款给客服发消息', '申请退款给客服发消息', 1, 0, 0, 0, 2, 1, '您有新的退款待处理', '您有一笔退款订单待处理，订单号{order_id}!', 0, '520274', '{$admin_name}管理员,您有一笔退款订单待处理，订单号{$order_id}!', 0, 0, '您有个订单退款请注意查收\\n订单号：{order_id}', '{admin_name}管理员,{order_id}订单号', '', 2, 0),
 (19, 'admin_pay_success_code', '下单给客服发消息', '下单支付给客服发消息', 1, 0, 0, 0, 2, 1, '您有新的订单待处理', '您有一笔支付成功的订单待处理，订单号{order_id}!', 0, '520273', '{$admin_name}管理员,您有一笔支付成功的订单待处理，订单号{$order_id}!', 0, 0, '您有个新订单请注意查收\\n订单号：{order_id}', '{admin_name}管理员,{order_id}订单号', '', 2, 0),
-(20, 'order_deliver_success', '发货提醒发送', '发货用户提醒发送', 1, 0, 1, 1, 2, 0, '发货通知', '亲爱的用户{nickname}您的商品{store_name}，订单号{order_id}已发货，请注意查收', 0, '520269', '亲爱的用户{$nickname}您的商品{$store_name}，订单号{$order_id}已发货，请注意查收', 20, 5, '0', '{nickname}用户昵称,{store_name}商品名称,{order_id}订单号,{delivery_name}配送员姓名,{delivery_id}配送员电话,{user_address}收货地址', '', 1, 0),
-(21, 'order_postage_success', '发货快递提醒发送', '发货快递用户提醒发送', 1, 0, 1, 1, 2, 0, '发货通知', '亲爱的用户{nickname}您的商品{store_name}，订单号{order_id}已发货，请注意查收', 0, '520269', '亲爱的用户{$nickname}您的商品{$store_name}，订单号{$order_id}已发货，请注意查收', 16, 9, '0', '{nickname}用户昵称,{store_name}商品名称,{order_id}订单号,{delivery_name}快递名称,{delivery_id}快递单号,{user_address}收货地址', '', 1, 0),
-(22, 'send_order_pink_clone', '取消拼团提醒发送', '取消拼团给用户提醒发送', 1, 0, 1, 1, 0, 0, '取消拼团通知', '亲，您的拼团取消，活动名称{title}', 0, '0', '', 24, 15, '0', '{title}活动名称{count}拼团人数', '', 1, 0),
-(23, 'can_pink_success', '参团成功提醒发送', '参团成功给用户提醒发送', 1, 0, 1, 1, 0, 0, '参团成功通知', '亲，您已成功参与拼团，活动名称{title}', 0, '0', '', 23, 6, '0', '{title}活动名称,{nickname}团长,{count}拼团人数,{pink_time}开团时间', '', 1, 0),
+(20, 'order_deliver_success', '发货提醒发送', '发货用户提醒发送', 1, 0, 1, 1, 2, 0, '发货通知', '亲爱的用户{nickname}您的商品{store_name}，订单号{order_id}已发货，请注意查收', 0, '520269', '亲爱的用户{$nickname}您的商品{$store_name}，订单号{$order_id}已发货，请注意查收', 20, 9, '0', '{nickname}用户昵称,{store_name}商品名称,{order_id}订单号,{delivery_name}配送员姓名,{delivery_id}配送员电话,{user_address}收货地址', '', 1, 0),
+(21, 'order_postage_success', '发货快递提醒发送', '发货快递用户提醒发送', 1, 0, 1, 1, 2, 0, '发货通知', '亲爱的用户{nickname}您的商品{store_name}，订单号{order_id}已发货，请注意查收', 0, '520269', '亲爱的用户{$nickname}您的商品{$store_name}，订单号{$order_id}已发货，请注意查收', 16, 5, '0', '{nickname}用户昵称,{store_name}商品名称,{order_id}订单号,{delivery_name}快递名称,{delivery_id}快递单号,{user_address}收货地址', '', 1, 0),
+(22, 'send_order_pink_clone', '取消拼团提醒发送', '取消拼团给用户提醒发送', 1, 0, 1, 0, 0, 0, '取消拼团通知', '亲，您的拼团取消，活动名称{title}', 0, '0', '', 24, 15, '0', '{title}活动名称{count}拼团人数', '', 1, 0),
+(23, 'can_pink_success', '参团成功提醒发送', '参团成功给用户提醒发送', 1, 0, 1, 0, 0, 0, '参团成功通知', '亲，您已成功参与拼团，活动名称{title}', 0, '0', '', 23, 6, '0', '{title}活动名称,{nickname}团长,{count}拼团人数,{pink_time}开团时间', '', 1, 0),
 (24, 'kefu_send_extract_application', '提现申请给客服发消息', '提现申请给客服发消息', 1, 0, 0, 0, 0, 1, '你有个新的提现申请待处理', '您有一笔提现申请待处理，提现金额{money}!', 0, '0', '', 0, 0, '您有个提现申请请注意查收\\n>提现金额{money}', '{nickname}用户昵称,{money}提现金额', 'https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=ae3s-safwea-aa', 2, 0),
 (25, 'send_admin_confirm_take_over', '收货给客服发消息', '收货给客服发消息', 1, 0, 0, 0, 2, 1, '你有个新的用户收货待处理', '您有一笔订单已经确认收货，订单号{order_id}!', 0, '520422', '{$admin_name}管理员,您有一笔订单已经确认收货，订单号{$order_id}!', 0, 0, '您有个订单确认收货\\n>订单号{order_id}', '{storeTitle}商品名称,{order_id}订单号', '', 2, 0),
 (26, 'order_pay_false', '提醒付款通知', '提醒付款通知用户提醒发送', 1, 0, 1, 0, 2, 0, '提醒付款通知', '您有未付款订单,订单号为:{order_id}，商品数量有限，请及时付款。', 0, '528116', '您有未付款订单,订单号为:{$order_id}，商品数量有限，请及时付款。', 40, 0, '0', '', '', 1, 0),