Merge branch 'master' of e.coding.net:zdap/weixiu/weixiu_api into m--tmp

app/adminapi/controller/master_worker_register/MasterWorkerRegisterController.php

@@ -73,15 +73,7 @@ class MasterWorkerRegisterController extends BaseAdminController
         if (true === $result) {
             //审批通过 - 后续事件处理
             if($params['status'] == 1){
-                // 工程师入驻结果通知：【给工程师的通知】
-                event('Notice',  [
-                    'scene_id' => 110,
-                    'params' => [
-                        'user_id' => 0,
-                        'mobile' => $params['mobile'],
-                    ]
-                ]);
-                // 通知发送 账号密码
+                // 通知发送 账号密码/线下面授
                 MasterWorkerRegisterLogic::eventNotice($params);
             }else{
                 // 工程师入驻失败通知：【给工程师的通知】

app/adminapi/logic/master_worker_register/MasterWorkerRegisterLogic.php

@@ -23,6 +23,7 @@ use app\common\model\master_worker\MasterWorkerAuth;
 use app\common\model\master_worker\MasterWorkerScore;
 use app\common\model\master_worker_register\MasterWorkerRegister;
 use app\common\logic\BaseLogic;
+use app\common\model\notice\NoticeArea;
 use app\common\service\ConfigService;
 use think\facade\Config;
 use think\facade\Db;
@@ -243,6 +244,19 @@ class MasterWorkerRegisterLogic extends BaseLogic
     {
         $registerInfo = MasterWorkerRegister::findOrEmpty($params['id'])->toArray();
         if ($registerInfo && $registerInfo['worker_id']) {
+            if($registerInfo['sale_id'] == 0){
+                // 不同区域用户，通知不同区负责人，销售来源则不用通知
+                $tel = NoticeArea::where(['scene_id'=>110,'city'=>$registerInfo['city']])->value('tel')??'15827105069';
+                // 工程师入驻结果通知：【给工程师的通知】
+                event('Notice',  [
+                    'scene_id' => 110,
+                    'params' => [
+                        'user_id' => 0,
+                        'mobile' => $params['mobile'],
+                        //'tel' => $tel
+                    ]
+                ]);
+            }
             $account = MasterWorker::where('id',$registerInfo['worker_id'])->value('account');
             event('Notice',  [
                 'scene_id' => 107,

app/api/logic/GroupActivityLogic.php

@@ -65,7 +65,7 @@ class GroupActivityLogic extends BaseLogic
 
             $detail['users'] = GroupUserOrder::alias('a')
                                 ->leftJoin('user b','a.user_id=b.id')
-                                ->where(['a.id'=>$order_id,'a.status'=>1])
+                                ->where(['a.group_order_id'=>$order_id,'a.status'=>1])
                                 ->field(['a.id','a.user_id','a.status','a.create_time','b.avatar','b.nickname'])
                                 ->order('a.create_time','asc')
                                 ->select()
@@ -109,7 +109,7 @@ class GroupActivityLogic extends BaseLogic
      * @notes 用户订单详情
      */
     public static function userOrderDetail($order_id,$userId){
-        $detail = GroupUserOrder::with('groupOrder')->where(['id'=>$order_id, 'user_id' => $userId])->field('id,status,pay_way,pay_time,pay_status,refund_status,remark,create_time,group_order_id,group_activity_id,user_equity_id,area,address')->findOrEmpty()->toArray();
+        $detail = GroupUserOrder::with('groupOrder')->where(['id'=>$order_id, 'user_id' => $userId])->field('id,sn,status,pay_way,pay_time,pay_status,refund_status,remark,create_time,group_order_id,group_activity_id,user_equity_id,area,address')->findOrEmpty()->toArray();
         if ($detail) {
             $detail['is_refund'] = 0;
             if ($detail['pay_status'] == 1 && $detail['refund_status'] == 0) {

app/common/model/notice/NoticeArea.php

@@ -0,0 +1,34 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\common\model\notice;
+
+
+use app\common\model\BaseModel;
+
+
+
+/**
+ * NoticeArea模型
+ * Class NoticeArea
+ * @package app\common\model
+ */
+class NoticeArea extends BaseModel
+{
+    
+    protected $name = 'notice_area';
+    
+
+    
+}