Merge remote-tracking branch 'origin/master'

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/group_activity/GroupOrderLogic.php

@@ -15,9 +15,9 @@
 namespace app\adminapi\logic\group_activity;
 
 
+use think\facade\Queue;
 use app\common\logic\BaseLogic;
 use app\common\model\user\User;
-use app\common\command\addServiceWork;
 use app\common\model\equity\EquityConfig;
 use app\common\model\group_activity\GroupOrder;
 use app\common\model\group_activity\GroupActivity;
@@ -68,9 +68,8 @@ class GroupOrderLogic extends BaseLogic
             //$detail->work_status = 1;
             //$detail->save();
             // 异步调用 changeWorkStatus 方法
-            // Queue::push(\app\job\AddServiceWorkJob::class, ['id' => $params['id']]);
-            // $detail->work_status = 1;
-            // $detail->save();
+            Queue::push(\app\job\AddServiceWorkJob::class, ['id' => $params['id']]);
+            
         }
         return $detail->toArray();
     }

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,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) {
@@ -119,7 +119,12 @@ class GroupActivityLogic extends BaseLogic
                     $detail['is_refund'] = 1;
                 }
             }
-            $detail['goods'] = EquityConfig::where('id', $detail['groupOrder']['equity_id'])->field('id,equity_name,number,day_num')->findOrEmpty()->toArray();
+            $detail['activity'] = GroupActivity::with('goods')->where(['id'=>$detail['group_activity_id']])->visible([
+                'id','title','image','start_time','end_time','type','equity_id',
+                'participant_num','origin_price','price','form_time_limit','area'
+            ])->findOrEmpty()->toArray();
+            
+            $detail['activity']['area'] = explode(",",$detail['activity']['area']);
             $detail['timestamp'] = time();
         }
         return $detail;
@@ -201,11 +206,11 @@ class GroupActivityLogic extends BaseLogic
 
             //生成用户拼单订单
             $data = [
-                'sn' => $groupOrder['sn'],
+                'sn' => generate_sn(groupUserOrder::class, 'sn'),
                 'group_order_id' => $groupOrder['id'],
                 'group_activity_id' => $params['group_activity_id'],
                 'user_id' => $params['user_id'],
-                'remark' => isset($params['remark']) ?? '',
+                'remark' => isset($params['remark']) ? $params['remark'] : '',
                 'order_amount' => $order_amount,
                 'order_terminal' => $params['terminal'],
             ];
@@ -225,7 +230,8 @@ class GroupActivityLogic extends BaseLogic
 
         return [
             'order_id' => (int)$userOrder['id'],
-            'sn' => $groupOrder['sn']
+            'sn' => $groupOrder['sn'],
+            'id' => (int)$groupOrder['id'],
         ];
     }
 
@@ -363,7 +369,7 @@ class GroupActivityLogic extends BaseLogic
     public static function getQRCode($params,$url)
     {
         try {
-            $mnp_page = 'pages/web_view/group';
+            $mnp_page = 'pages/group/orderSure';
             
             $scene_page = 'group';
             $response = (new WeChatMnpService())->getUnlimitedQRCode(

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';
+    
+
+    
+}

app/common/service/pay/WeChatPayService.php

@@ -22,6 +22,7 @@ use app\common\logic\PayNotifyLogic;
 use app\common\model\recharge\RechargeOrder;
 use app\common\model\user\UserAuth;
 use app\common\model\works\ServiceWork;
+use app\common\model\group_activity\GroupUserOrder;
 use app\common\service\wechat\WeChatConfigService;
 use EasyWeChat\Pay\Application;
 use EasyWeChat\Pay\Message;
@@ -378,15 +379,20 @@ class WeChatPayService extends BasePayService
                 $extra['transaction_id'] = $message['transaction_id'];
                 $attach = $message['attach'];
                 $message['out_trade_no'] = mb_substr($message['out_trade_no'], 0, 18);
-                $order = RechargeOrder::where(['sn' => $message['out_trade_no']])->findOrEmpty();
-                if($order->isEmpty() || $order->pay_status == PayEnum::ISPAID) {
-                    return true;
-                }
+                
                 switch ($attach) {
                     case 'recharge':
+                        $order = RechargeOrder::where(['sn' => $message['out_trade_no']])->findOrEmpty();
+                        if($order->isEmpty() || $order->pay_status == PayEnum::ISPAID) {
+                            return true;
+                        }
                         PayNotifyLogic::handle('recharge', $message['out_trade_no'], $extra);
                         break;
                     case 'goods':
+                        $order = RechargeOrder::where(['sn' => $message['out_trade_no']])->findOrEmpty();
+                        if($order->isEmpty() || $order->pay_status == PayEnum::ISPAID) {
+                            return true;
+                        }
                         $res = PayNotifyLogic::handle('goods', $message['out_trade_no'], $extra);
                         if($res === true){
                             // 用户下单后，给订单运营专员(配置固定ID)发送公众号提醒（订单信息）
@@ -426,6 +432,13 @@ class WeChatPayService extends BasePayService
                             }
                         }
                         break;
+                    case 'group':
+                        $order = GroupUserOrder::where(['sn' => $message['out_trade_no']])->findOrEmpty();
+                        if($order->isEmpty() || $order->pay_status == PayEnum::ISPAID) {
+                            return true;
+                        }
+                        PayNotifyLogic::handle('group', $message['out_trade_no'], $extra);
+                        break;
                 }
             }
             return true;

composer.json

@@ -25,6 +25,7 @@
         "topthink/think-orm": "^3.0",
         "topthink/think-multi-app": "^1.0",
         "topthink/think-view": "^2.0",
+        "topthink/think-queue": "^3.0",
         "dragonmantank/cron-expression": "^3.3",
         "qiniu/php-sdk": "7.4",
         "qcloud/cos-sdk-v5": "^2.5",