diff --git a/application/admin/controller/wechat/StoreService.php b/application/admin/controller/wechat/StoreService.php
index 39cc9c53..f4f27b32 100644
--- a/application/admin/controller/wechat/StoreService.php
+++ b/application/admin/controller/wechat/StoreService.php
@@ -47,6 +47,7 @@ class StoreService extends AuthController
             ['order_second',''],
             ['subscribe',''],
             ['now_money',''],
+            ['is_promoter',''],
         ],$this->request);
         $this->assign('where',$where);
         $this->assign(UserModel::systemPage($where));
@@ -88,8 +89,8 @@ class StoreService extends AuthController
         $f = array();
         $f[] = Form::frameImageOne('avatar','客服头像',Url::build('admin/widget.images/index',array('fodder'=>'avatar')),$service['avatar'])->icon('image');
         $f[] = Form::input('nickname','客服名称',$service["nickname"]);
-        $f[] = Form::input('content','通知内容')->type('textarea');
-        $f[] = Form::radio('status','状态',$service['status'])->options([['value'=>1,'label'=>'显示'],['value'=>0,'label'=>'隐藏']]);
+        $f[] = Form::switches('notify','订单通知',$service["notify"])->trueValue(1)->falseValue(0)->openStr('开启')->closeStr('关闭');
+        $f[] = Form::radio('status','客服状态',$service['status'])->options([['value'=>1,'label'=>'显示'],['value'=>0,'label'=>'隐藏']]);
         $form = Form::make_post_form('修改数据',$f,Url::build('update',compact('id')));
         $this->assign(compact('form'));
         return $this->fetch('public/form-builder');
@@ -105,7 +106,11 @@ class StoreService extends AuthController
         $params = $request->post();
         if(empty($params["nickname"]))return Json::fail("客服名称不能为空！");
 //        print_r($params);die;
-        $data = array("avatar"=>$params["avatar"],"nickname"=>$params["nickname"],'status'=>$params['status']);
+        $data = array("avatar"=>$params["avatar"]
+        ,"nickname"=>$params["nickname"]
+        ,'status'=>$params['status']
+        ,'notify'=>$params['notify']
+        );
         ServiceModel::edit($data,$id);
         return Json::successful('修改成功!');
     }
diff --git a/extend/service/WechatTemplateService.php b/extend/service/WechatTemplateService.php
index d351bc62..6f879f92 100644
--- a/extend/service/WechatTemplateService.php
+++ b/extend/service/WechatTemplateService.php
@@ -8,7 +8,8 @@
 namespace service;
 
 use app\wap\model\user\WechatUser;
-use think\Db;
+use app\admin\model\wechat\WechatTemplate as WechatTemplateModel;
+use app\admin\model\wechat\StoreService as ServiceModel;
 
 class WechatTemplateService
 {
@@ -52,7 +53,7 @@ class WechatTemplateService
 
     public static function sendTemplate($openid,$templateId,array $data,$url = null,$defaultColor = '')
     {
-        $templateinfo = Db::name('WechatTemplate')->where('tempkey',$templateId)->where('status',1)->find();
+        $templateinfo = WechatTemplateModel::where('tempkey',$templateId)->where('status',1)->find();
         if(!$templateinfo) return false;
         try{
             return WechatService::sendTemplate($openid,$templateinfo['tempid'],$data,$url,$defaultColor);
@@ -61,10 +62,22 @@ class WechatTemplateService
         }
     }
 
+    /**服务进度通知
+     * @param array $data
+     * @param null $url
+     * @param string $defaultColor
+     * @return bool
+     */
     public static function sendAdminNoticeTemplate(array $data,$url = null,$defaultColor = '')
     {
-        $adminIds = SystemConfigService::get('site_store_admin_uids');
-        if(!$adminIds || !($adminList = array_unique(array_filter(explode(',',trim($adminIds)))))) return false;
+        $adminIds = explode(',',trim(SystemConfigService::get('site_store_admin_uids')));
+        $kefuIds = ServiceModel::where('notify',1)->column('uid');
+        if(empty($adminIds[0])){
+            $adminList = array_unique($kefuIds);
+        }else{
+            $adminList = array_unique(array_merge($adminIds,$kefuIds));
+        }
+        if(!is_array($adminList) || empty($adminList)) return false;
         foreach ($adminList as $uid){
             try{
                 $openid = WechatUser::uidToOpenid($uid);