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

app/Job/AddServiceWorkJob.php

@@ -1,96 +0,0 @@
-<?php
-namespace app\job;
-
-use think\facade\Db;
-use think\queue\Job;
-use think\facade\Log;
-use app\common\enum\WorkEnum;
-use app\common\model\equity\UserEquity;
-use app\common\model\works\ServiceWork;
-use app\common\model\equity\UserEquityLog;
-use app\common\model\group_activity\GroupUserOrder;
-
-class AddServiceWorkJob
-{
-    public function fire(Job $job, $data)
-    {
-        try {
-            Log::info('执行队列任务：'.json_encode($data));
-
-            //查询拼团用户订单
-            $userOrder = GroupUserOrder::alias('a')->leftJoin('user b','a.user_id=b.id')
-                        ->where('group_order_id', $data['id'])
-                        ->where('pay_status', 1)
-                        ->where('refund_status', 0)
-                        ->field('a.*,b.mobile')
-                        ->select()
-                        ->toArray();
-            try {
-                Db::startTrans();
-                foreach ($userOrder as $k => $item) {
-                    if (empty($goods)) {
-                        $goods = UserEquity::alias('a')->leftJoin('goods b','a.goods_id=b.id')
-                            ->where('a.id', $item['user_equity_id'])
-                            ->field('b.goods_name,b.category_type,b.goods_category_ids,b.goods_category_id,b.base_service_fee')
-                            ->find();
-                    }
-                    //生成服务工单
-                    $work_data = [
-                        'work_sn' => generate_sn(ServiceWork::class, 'work_sn'),
-                        'real_name' => '',
-                        'mobile' => $item['mobile'],
-                        'address' => $item['area'].$item['address'],
-                        'province' => 0,
-                        'city' => 0,
-                        'area_name' => '',
-                        'title' => $goods['goods_name'],
-                        'category_type' => $goods['category_type'],
-                        'goods_category_ids' => $goods['goods_category_ids'],
-                        'goods_category_id' => $goods['goods_category_id'],
-                        'base_service_fee' => $goods['base_service_fee'],
-                        'service_fee' => $item['paid_amount'],
-                        'work_pay_status'=>WorkEnum::IS_PAY_STATUS,
-                        'appointment_time' => time(),
-                        'user_id'=>$item['user_id'],
-                        'lon'=>'',
-                        'lat'=>'',
-                        'property_activity_id'=>0,
-                        'user_equity_id'=>0,
-                        'third_type'=>1,
-                        'work_total'=>$item['paid_amount'],
-                        'work_amount'=>$item['paid_amount'],
-                        'work_status' => 5,
-                        'user_confirm_status' => 3,
-                        'service_status' => 1,
-                        'master_worker_id' => 7,
-                        'remark' => '拼团单：'.$item['id'],
-                        'user_equity_id' => $item['user_equity_id'],
-                        'group_order_id' => $item['id'],
-                    ];
-                    ServiceWork::create($work_data);
-    
-                    UserEquityLog::create([
-                        'user_id' => $item['user_id'],
-                        'number' => 1,
-                        'user_equity_id' => $item['user_equity_id'],
-                        'create_time' => time(),
-                    ]);
-                }
-                Db::commit();
-            } catch (\Exception $e) {
-                Db::rollback();
-                Log::error('执行队列任务失败：'.$e->getMessage());
-            }
-            // 任务执行成功，删除任务
-            $job->delete();
-        } catch (\Exception $e) {
-            // 任务执行失败，重试任务
-            if ($job->attempts() > 3) {
-                // 超过最大重试次数，删除任务
-                $job->delete();
-            } else {
-                $job->release(10); // 10 秒后重试
-            }
-        }
-    }
-}

app/adminapi/controller/group_activity/GroupActivityCategoryController.php

@@ -0,0 +1,114 @@
+<?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\adminapi\controller\group_activity;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\group_activity\GroupActivityCategoryLists;
+use app\adminapi\logic\group_activity\GroupActivityCategoryLogic;
+use app\adminapi\validate\group_activity\GroupActivityCategoryValidate;
+
+
+/**
+ * 拼团活动分类控制器
+ * Class GroupActivityCategoryController
+ * @package app\adminapi\controller\group_activity
+ */
+class GroupActivityCategoryController extends BaseAdminController
+{
+
+    /**
+     * @notes 获取列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2025/03/13 10:31
+     */
+    public function lists()
+    {
+        return $this->dataLists(new GroupActivityCategoryLists());
+    }
+
+
+    /**
+     * @notes 添加
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2025/03/13 10:31
+     */
+    public function add()
+    {
+        $params = (new GroupActivityCategoryValidate())->post()->goCheck('add');
+        $result = GroupActivityCategoryLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(GroupActivityCategoryLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2025/03/13 10:31
+     */
+    public function edit()
+    {
+        $params = (new GroupActivityCategoryValidate())->post()->goCheck('edit');
+        $result = GroupActivityCategoryLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(GroupActivityCategoryLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2025/03/13 10:31
+     */
+    public function delete()
+    {
+        $params = (new GroupActivityCategoryValidate())->post()->goCheck('delete');
+        GroupActivityCategoryLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2025/03/13 10:31
+     */
+    public function detail()
+    {
+        $params = (new GroupActivityCategoryValidate())->goCheck('detail');
+        $result = GroupActivityCategoryLogic::detail($params);
+        return $this->data($result);
+    }
+    /**
+     * 获取活动分类二维码
+     */
+    public function getQRCode()
+    {
+        $params = (new GroupActivityCategoryValidate())->post()->goCheck('detail');
+        return $this->success('',['qrcode'=>GroupActivityCategoryLogic::getQRCode($params, $this->request->domain())], 1, 1);
+    }
+
+}

app/adminapi/controller/third/ThirdGoodsController.php

@@ -143,12 +143,13 @@ class ThirdGoodsController extends BaseAdminController
                 if(in_array($items['dealGroupId'], $product_ids)){
                     unset($data[$key]);
                 }else{
-                    $good_data[] = [
+                     $good_data[] = [
                         'third_type' => 1,
                         'goods_id' => 0,
                         'product_id' => $items['dealGroupId'],
                         'product_name' => $items['title'],
                         'product_price' => $items['price'],
+                        'app_sku_id' =>$items['dealId']
                     ];
                 }
             }

app/adminapi/lists/group_activity/GroupActivityCategoryLists.php

@@ -0,0 +1,78 @@
+<?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\adminapi\lists\group_activity;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\group_activity\GroupActivityCategory;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 拼团活动分类列表
+ * Class GroupActivityCategoryLists
+ * @package app\adminapi\listsgroup_activity
+ */
+class GroupActivityCategoryLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2025/03/13 10:31
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['id', 'status'],
+            '%like%' => ['title'],
+        ];
+    }
+
+    /**
+     * @notes 获取列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2025/03/13 10:31
+     */
+    public function lists(): array
+    {
+        $list = GroupActivityCategory::where($this->searchWhere)
+            ->field(['id', 'title', 'status','create_time'])
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()
+            ->toArray();
+        return $list;
+    }
+
+
+    /**
+     * @notes 获取拼团活动数量
+     * @return int
+     * @author likeadmin
+     * @date 2025/03/13 10:31
+     */
+    public function count(): int
+    {
+        return GroupActivityCategory::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/logic/group_activity/GroupActivityCategoryLogic.php

@@ -0,0 +1,146 @@
+<?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\adminapi\logic\group_activity;
+
+
+use think\Exception;
+use think\facade\Log;
+use app\common\logic\BaseLogic;
+use app\common\model\group_activity\GroupActivity;
+use app\common\service\wechat\WeChatMnpService;
+use app\common\model\group_activity\GroupActivityCategory;
+
+/**
+ * 拼团活动分类逻辑
+ * Class GroupActivityCategoryLogic
+ * @package app\adminapi\logic\group_activity
+ */
+class GroupActivityCategoryLogic extends BaseLogic
+{
+
+
+    /**
+     * @notes 添加
+     * @param array $params
+     * @return bool
+     * @author likeadmin
+     * @date 2025/03/13 10:31
+     */
+    public static function add(array $params): bool
+    {
+        try {
+            $params['block_data'] = json_encode($params['block_data']);
+            $params['images'] = implode(",",$params['images']);
+            GroupActivityCategory::create([
+                'title' => $params['title'],
+                'images' => $params['images'],
+                'block_data' => $params['block_data'],
+                'status' => $params['status'],
+            ]);
+
+            return true;
+        } catch (\Exception $e) {
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
+
+
+    /**
+     * @notes 编辑拼团活动
+     * @param array $params
+     * @return bool
+     * @author likeadmin
+     * @date 2025/03/13 10:31
+     */
+    public static function edit(array $params): bool
+    {
+        try {
+            $params['block_data'] = json_encode($params['block_data']);
+            $params['images'] = implode(",",$params['images']);
+            GroupActivityCategory::where('id', $params['id'])->update([
+                'title' => $params['title'],
+                'images' => $params['images'],
+                'block_data' => $params['block_data'],
+                'status' => $params['status'],
+            ]);
+            return true;
+        } catch (\Exception $e) {
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
+
+
+    /**
+     * @notes 删除
+     * @param array $params
+     * @return bool
+     * @author likeadmin
+     * @date 2025/03/13 10:31
+     */
+    public static function delete(array $params): bool
+    {
+        return GroupActivityCategory::destroy($params['id']);
+    }
+
+
+    /**
+     * @notes 获取拼团活动详情
+     * @param $params
+     * @return array
+     * @author likeadmin
+     * @date 2025/03/13 10:31
+     */
+    public static function detail($params): array
+    {
+        $detail = GroupActivityCategory::findOrEmpty($params['id'])->toArray();
+        $detail['block_data'] = $detail['block_data'] ? json_decode($detail['block_data'],true) : [];
+        $detail['images'] = $detail['images'] ? explode(",",$detail['images']) : [];
+        $detail['activity'] = GroupActivity::with('goods')->field('id,equity_id,title,image')->select()->toArray();
+        return $detail;
+    }
+
+    /**
+     * 获取二维码
+     * @return string|void
+     */
+    public static function getQRCode($params,$url)
+    {
+        try {
+            $mnp_page = 'pages/web_view/group_catogory';
+            
+            $scene_page = 'group';
+            Log::info('getQRCode:'.rawurlencode($scene_page));
+            $response = (new WeChatMnpService())->getUnlimitedQRCode(
+                'page='.$scene_page.'&id='.$params['id'],
+                $mnp_page,
+                env('miniprogram.mini_env_version', 'release'),
+                false
+            );
+            Log::info('getQRCode:'.json_encode([$response]));
+            $qrcode = $response->getContent();
+            if(!is_dir('./uploads/wx_qrcode/'.date('Ymd'))){
+                mkdir('./uploads/wx_qrcode/'.date('Ymd'));
+            }
+            $file_name = 'uploads/wx_qrcode/'.date('Ymd').'/'.time().rand(1000,9999).'.png';
+            file_put_contents($file_name, $qrcode);
+            return $url.'/'.$file_name;
+        } catch (\Throwable $e) {
+            Log::info('getQRCode:'.$e->getMessage());
+            return '';
+        }
+    }
+}

app/adminapi/logic/group_activity/GroupOrderLogic.php

@@ -15,9 +15,11 @@
 namespace app\adminapi\logic\group_activity;
 
 
+use think\facade\Log;
 use think\facade\Queue;
 use app\common\logic\BaseLogic;
 use app\common\model\user\User;
+use app\common\model\equity\UserEquity;
 use app\common\model\equity\EquityConfig;
 use app\common\model\group_activity\GroupOrder;
 use app\common\model\group_activity\GroupActivity;
@@ -65,11 +67,12 @@ class GroupOrderLogic extends BaseLogic
     {
         $detail = GroupOrder::findOrEmpty($params['id']);
         if (!$detail->isEmpty() && $detail->work_status == 0 && $detail->status == 1) {
-            //$detail->work_status = 1;
-            //$detail->save();
+
             // 异步调用 changeWorkStatus 方法
             Queue::push(\app\job\AddServiceWorkJob::class, ['id' => $params['id']]);
             
+            $detail->work_status = 1;
+            $detail->save();
         }
         return $detail->toArray();
     }

app/adminapi/logic/works/ServiceWorkLogic.php

@@ -14,6 +14,7 @@
 
 namespace app\adminapi\logic\works;
 
+use app\common\enum\ThirdTypeEnum;
 use app\common\logic\ThirdOrderLogic;
 use app\common\model\third\ThirdOrders;
 use think\Exception;
@@ -419,6 +420,12 @@ class ServiceWorkLogic extends BaseLogic
             ];
             ServiceWorkerAllocateWorkerLogic::add($work_log);
             Db::commit();
+
+            //美团的订单更新履约状态为已分配
+            if($work->third_type == 1){
+                ThirdOrderLogic::updateorderfulfillinfo($work,ThirdTypeEnum::MEITUAN_MEITUAN);
+            }
+
             // 工程师派单通知【给工程师的通知】【公众号通知，不发短信】
             $workDetail = ServiceWorkLogic::detail($params);
             $res = event('Notice',  [

app/adminapi/validate/group_activity/GroupActivityCategoryValidate.php

@@ -0,0 +1,102 @@
+<?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\adminapi\validate\group_activity;
+
+
+use app\common\validate\BaseValidate;
+
+
+/**
+ * 拼团活动分类验证器
+ * Class GroupActivityCategoryValidate
+ * @package app\adminapi\validate\group_activity
+ */
+class GroupActivityCategoryValidate extends BaseValidate
+{
+
+     /**
+      * 设置校验规则
+      * @var string[]
+      */
+    protected $rule = [
+        'id' => 'require',
+        'title' => 'require',
+        'images' => 'require',
+        'block_data' => 'require',
+
+    ];
+
+
+    /**
+     * 参数描述
+     * @var string[]
+     */
+    protected $field = [
+        'id' => 'id',
+        'title' => '活动名称',
+        'images' => '活动图片',
+        'block_data' => '活动分类板块',
+
+    ];
+
+
+    /**
+     * @notes 添加场景
+     * @return GroupActivityValidate
+     * @author likeadmin
+     * @date 2025/03/13 10:31
+     */
+    public function sceneAdd()
+    {
+        return $this->only(['title','images','block_data']);
+    }
+
+
+    /**
+     * @notes 编辑场景
+     * @return GroupActivityValidate
+     * @author likeadmin
+     * @date 2025/03/13 10:31
+     */
+    public function sceneEdit()
+    {
+        return $this->only(['id','title','images','block_data']);
+    }
+
+
+    /**
+     * @notes 删除场景
+     * @return GroupActivityValidate
+     * @author likeadmin
+     * @date 2025/03/13 10:31
+     */
+    public function sceneDelete()
+    {
+        return $this->only(['id']);
+    }
+
+
+    /**
+     * @notes 详情场景
+     * @return GroupActivityValidate
+     * @author likeadmin
+     * @date 2025/03/13 10:31
+     */
+    public function sceneDetail()
+    {
+        return $this->only(['id']);
+    }
+
+}

app/api/controller/GroupActivityController.php

@@ -18,12 +18,22 @@ class GroupActivityController extends BaseApiController
     public array $notNeedLogin = [];
 
 
+    /**
+     * 活动分类列表
+     */
+    public function categoryList()
+    {
+        $id = (int)$this->request->param('id');
+        $result = GroupActivityLogic::categoryList($id);
+        return $this->data($result);
+    }
+
     /**
      * 活动详情
      */
     public function detail()
     {
-        $id = $this->request->param('id');
+        $id = (int)$this->request->param('id');
         $result = GroupActivityLogic::detail($id,$this->userId);
         return $this->data($result);
     }
@@ -32,7 +42,7 @@ class GroupActivityController extends BaseApiController
      * 拼团订单详情
      */
     public function orderDetail(){
-        $order_id = $this->request->param('order_id');
+        $order_id = (int)$this->request->param('order_id');
         $result = GroupActivityLogic::orderDetail($order_id,$this->request->domain());
         return $this->data($result);
     }
@@ -41,7 +51,7 @@ class GroupActivityController extends BaseApiController
      * 用户订单详情
      */
     public function userOrderDetail(){
-        $order_id = $this->request->param('order_id');
+        $order_id = (int)$this->request->param('order_id');
         $result = GroupActivityLogic::userOrderDetail($order_id,$this->userId);
         return $this->data($result);
     }

app/api/controller/notify/MeiTuanNotifyController.php

@@ -4,6 +4,7 @@ namespace app\api\controller\notify;
 
 use app\api\controller\BaseApiController;
 use app\common\enum\PayEnum;
+use app\common\enum\ThirdTypeEnum;
 use app\common\enum\WorkEnum;
 use app\common\logic\ThirdOrderLogic;
 use app\common\model\equity\UserEquity;
@@ -209,7 +210,7 @@ class MeiTuanNotifyController extends BaseApiController
         //尾款结算2--维修的尾款订单信息增加
         //获取工单信息
         $request = $this->request->param();
-//        $request = json_decode('{"opBizCode":"AE7MKOJAV67338LIC3UD0K5TGIO","msgType":"5810029","developerId":"114657","businessId":"58","sign":"01b0ddb70d91a22d7e22f04935e938413142e16e","msgId":"7475175529296583912","message":"{\"orderId\":\"61374467\",\"addPriceStatus\":\"0\",\"serialNumber\":\"8283252725\",\"amount\":\"1.00\"}","timestamp":"1741600285"}',true);
+//        $request = json_decode('{"opBizCode":"AE7MKOJAV67338LIC3UD0K5TGIO","msgType":"5810029","developerId":"114657","businessId":"58","sign":"7f936c6c65ee05fa50a105fdc7bbb2652ccfe9b6","msgId":"2993785907604100573","message":"{\"orderId\":\"62737288\",\"addPriceStatus\":\"0\",\"serialNumber\":\"5962563697\",\"amount\":\"9.90\"}","timestamp":"1742907755"}',true);
         Log::write('补价支付结果:'.json_encode($this->request->param(),JSON_UNESCAPED_UNICODE));
         if(!empty($request['message'])){
             Db::startTrans();
@@ -231,7 +232,7 @@ class MeiTuanNotifyController extends BaseApiController
                             if(count($orders)==1){
                                 //判断是否是一口价预支付订单，支付成功后生成尾款订单，针对工程师未报价的订单
                                 $good_order = $orders[0];
-                                $order_goods = OrderGoods::where('sn',$good_order->sn)->findOrEmpty();
+                                $order_goods = OrderGoods::where('sn',$good_order['sn'])->findOrEmpty();
                                 if(!$order_goods->isEmpty()){
                                     //新增待支付尾款
                                     $order_data = [
@@ -267,7 +268,7 @@ class MeiTuanNotifyController extends BaseApiController
         //尾款结算1        //尾款结算3
         //获取工单信息
         $request = $this->request->param();
-//        $request = json_decode('{"opBizCode":"AE7MKOJAV67338LIC3UD0K5TGIO","msgType":"5810031","developerId":"114657","businessId":"58","sign":"d43ab164d41859ce7df2894e3e8f086d0c3182cb","msgId":"-1355174693375827369","message":"{\"orderId\":\"61659141\",\"verifyStatus\":\"2\",\"verifyChannel\":\"1\",\"type\":\"2\",\"serialNumber\":\"7843863751\"}","timestamp":"1741927727"}',true);
+//        $request = json_decode('{"opBizCode":"AE7MKOJAV67338LIC3UD0K5TGIO","msgType":"5810031","developerId":"114657","businessId":"58","sign":"013a53f59601e5f7dd5fa1f716127384e24dbdd3","msgId":"-7483972612472674819","message":"{\"orderId\":\"62737288\",\"verifyStatus\":\"2\",\"verifyChannel\":\"1\",\"type\":\"2\",\"serialNumber\":\"1315233958\"}","timestamp":"1742907756"}',true);
         Log::write('预订核销同步:'.json_encode($this->request->param(),JSON_UNESCAPED_UNICODE));
         if(!empty($request['message'])){
             Db::startTrans();
@@ -301,6 +302,8 @@ class MeiTuanNotifyController extends BaseApiController
                             $work->work_pay_status = 1;
                             $work->finished_time = time();
                             $work->save();
+
+                            ThirdOrderLogic::updateorderfulfillinfo($work,ThirdTypeEnum::MEITUAN_COMPLETION);
                         }
                     }
                 }

app/api/controller/notify/SendBxMailController.php

@@ -19,7 +19,7 @@ class SendBxMailController extends BaseApiController
     public function sendMail()
     {
         // 文件路径 - 替换为你的实际文件路径
-        $filePath = 'uploads/baoxian/20250321职业责任险投保清单.xlsx';
+        $filePath = 'uploads/baoxian/20250327职业责任险投保清单.xlsx';
         $mail = new PHPMailer(true);
 
         try {
@@ -37,6 +37,10 @@ class SendBxMailController extends BaseApiController
             // 发送者和接收者设置
             $mail->setFrom('whkyjl@126.com', '武汉开源节流科技有限公司');     // 发件人邮箱和名称
             $mail->addAddress('sujing@ub.chinalife-p.com.cn', '出单业务'); // 收件人邮箱和名称
+            $mail->addAddress('649478907@qq.com', '出单业务'); // 收件人邮箱和名称
+            $mail->addAddress('liliangjie@ub.chinalife-p.com.cn', '出单业务'); // 收件人邮箱和名称
+            $mail->addAddress('fangxuhao@outlook.com', '出单业务'); // 收件人邮箱和名称
+//            $mail->addAddress('1804628603@qq.com', '出单业务'); // 收件人邮箱和名称
 
             // 设置邮件内容
             $mail->isHTML(true);                                        // 将邮件正文设置为HTML格式
@@ -45,7 +49,7 @@ class SendBxMailController extends BaseApiController
             $mail->Body    = mb_convert_encoding('<p>你好，<br>请查收附件中的Excel文件。</p>', 'UTF-8', 'auto');
             $mail->AltBody = mb_convert_encoding('你好，请查收附件中的Excel文件。', 'UTF-8', 'auto');
             // 添加附件
-            $mail->addAttachment($filePath, '20250321职业责任险投保清单.xlsx'); // 添加附件，第二个参数是显示在邮件中的文件名
+            $mail->addAttachment($filePath, '20250327职业责任险投保清单.xlsx'); // 添加附件，第二个参数是显示在邮件中的文件名
 
             $mail->send();
             echo '邮件发送成功';

app/api/controller/notify/UserConfirmController.php

@@ -5,9 +5,12 @@ namespace app\api\controller\notify;
 use app\adminapi\logic\works\ServiceWorkLogic;
 use app\api\controller\BaseApiController;
 use app\api\validate\UserConfirmValidate;
+use app\common\enum\ThirdTypeEnum;
+use app\common\logic\ThirdOrderLogic;
 use app\common\model\master_worker\MasterWorker;
 use app\common\model\works\ServiceWork;
 use think\Exception;
+use think\facade\Log;
 
 /**
  *
@@ -32,6 +35,10 @@ class UserConfirmController extends BaseApiController
             $params['user_info'] = MasterWorker::where('id',$work['master_worker_id'])->field('worker_number,real_name')->findOrEmpty();//工程师信息
             $params['work_sn'] = $work_sn;
             $result = ServiceWorkLogic::confirmDoor($params);
+            if($work->third_type == 1){
+                $meituan_result = ThirdOrderLogic::updateorderfulfillinfo($work,ThirdTypeEnum::MEITUAN_ARRIVED);
+                Log::write('美团确认上门'.json_encode($meituan_result));
+            }
             if (false === $result) {
                 throw new Exception(ServiceWorkLogic::getError());
             }

app/api/logic/GroupActivityLogic.php

@@ -15,6 +15,7 @@ use app\common\model\equity\UserEquityLog;
 use app\common\model\group_activity\GroupOrder;
 use app\common\service\wechat\WeChatMnpService;
 use app\common\model\group_activity\GroupActivity;
+use app\common\model\group_activity\GroupActivityCategory;
 use app\common\model\group_activity\GroupUserOrder;
 
 
@@ -26,6 +27,18 @@ use app\common\model\group_activity\GroupUserOrder;
 class GroupActivityLogic extends BaseLogic
 {
 
+    /**
+     * 活动分类数据
+     */
+    public static function categoryList($id){
+        $detail = GroupActivityCategory::where('id',$id)->where('status',1)->field('id,title,images,block_data')->findOrEmpty()->toArray();
+        if($detail) {
+            $detail['images'] = $detail['images'] ? explode(",",$detail['images']) : [];
+            $detail['block_data'] = $detail['block_data'] ? json_decode($detail['block_data'],true) : [];
+        }
+        return $detail;
+    }
+
     /**
      * @notes 拼团活动详情
      */

app/api/validate/GroupOrderValidate.php

@@ -13,23 +13,21 @@ class GroupOrderValidate extends BaseValidate
 
     protected $rule = [
         'order_id'=>'require',
-        'sn'=>'require',
         'pay_way' => 'require',
         'group_activity_id' => 'require',
     ];
 
 
-    protected $message = [
-        'order_id.require' => '订单ID错误',
-        'sn.require' => '订单编号错误',
-        'pay_way.require' => '请选择支付方式',
-        'group_activity_id.require' => '拼团活动不存在',
+    protected $field = [
+        'order_id' => '订单ID',
+        'pay_way' => '支付方式',
+        'group_activity_id' => '拼团活动ID',
     ];
 
 
     public function sceneAdd()
     {
-        return $this->only(['pay_way','group_activity_id,remark']);
+        return $this->only(['pay_way','group_activity_id','remark']);
     }
 
     public function sceneDetail()

app/common/command/GroupOrder.php

@@ -44,7 +44,7 @@ class GroupOrder extends Command
                         ->where('a.status',0)
                         ->where('a.end_time','<',time())
                         ->where('a.id','>',$last_id)
-                        ->field('a.id,a.num,a.goods_id,b.participant_num,b.is_simulate_form,b.simulate_num')
+                        ->field('a.id,a.num,a.equity_id,b.participant_num,b.is_simulate_form,b.simulate_num')
                         ->order('a.id','asc')
                         ->limit(30)
                         ->select()->toArray();
@@ -56,20 +56,20 @@ class GroupOrder extends Command
             foreach($list as $item) {
                 $last_id = $item['id'];
 
-                $list = GroupUserOrder::where([
+                $orderList = GroupUserOrder::where([
                     'group_order_id' => $item['id'],
                     'pay_status' => 1,
                     'status' => 1,
                     'refund_status' => 0,
                 ])
                 ->field('id,user_id,sn,remark,order_amount,pay_way,transaction_id,order_terminal')->order('id','asc')->select()->toArray();
-                $num = count($list);
+                $num = count($orderList);
                 if (($item['is_simulate_form'] == 1 && $num >= $item['simulate_num']) || ($item['is_simulate_form'] == 0 && $num >= $item['participant_num'])) {
                     //模拟成团
-                    $this->gruopSuccess($item,$list);
+                    $this->gruopSuccess($item,$orderList);
                 } else {
                     //拼团失败
-                    $this->groupFail($item,$list);
+                    $this->groupFail($item,$orderList);
                 }
             }
         }
@@ -80,19 +80,19 @@ class GroupOrder extends Command
      * 拼团成功(给已支付的用户发放权益卡)
      * @param $item
      */
-    protected function gruopSuccess($order,$list)
+    protected function gruopSuccess($order,$orderList)
     {
         $max_id = UserEquity::max('id');
         try {
             Db::startTrans();
-            $equityConfig = EquityConfig::where('id',$order['goods_id'])->findOrEmpty();
-            foreach($list as $item) {
+            $equityConfig = EquityConfig::where('id',$order['equity_id'])->findOrEmpty()->toArray();
+            foreach($orderList as $item) {
                 //用户发放权益卡
                 $max_id++;
                 //创建用户权益卡
                 $userEquity = UserEquity::create([
                     'user_id' => $item['user_id'],
-                    'equity_id' => $order['goods_id'],
+                    'equity_id' => $order['equity_id'],
                     'goods_id' => $equityConfig['goods_id'],
                     'number' => $equityConfig['number'],
                     'create_time' => time(),
@@ -107,7 +107,7 @@ class GroupOrder extends Command
             //更新拼团订单
             GroupOrderModel::where('id',$order['id'])->update([
                 'status' => 1,
-                'num' => count($list)
+                'num' => count($orderList)
             ]);
 
             Db::commit();

app/common/enum/ThirdTypeEnum.php

@@ -0,0 +1,20 @@
+<?php
+namespace app\common\enum;
+
+/**
+ * 第三个平台枚举
+ * Class LoginEnum
+ * @package app\common\enum
+ */
+class ThirdTypeEnum
+{
+    /**
+     * 美团履约
+     * MEITUAN_MEITUAN 已分配
+     * MEITUAN_ARRIVED 已到达
+     * MEITUAN_COMPLETION 履约完成
+     */
+    const MEITUAN_MEITUAN = 40001;
+    const MEITUAN_ARRIVED = 40002;
+    const MEITUAN_COMPLETION = 41001;
+}

app/common/logic/ThirdOrderLogic.php

@@ -18,6 +18,7 @@ use app\common\{enum\GoodsEnum,
     model\works\ServiceWorkLog};
 use think\facade\Db;
 use app\common\model\service_area\ServiceArea;
+use think\facade\Log;
 
 /**
  * 第三方平台下单逻辑层
@@ -595,7 +596,8 @@ class ThirdOrderLogic extends BaseLogic
     public static function merchantcancelorder($work_id)
     {
         $third_order = ThirdOrders::where('work_id',$work_id)->findOrEmpty();
-        if(!$third_order->isEmpty() && !empty($third_order['request_msg'])){
+        if(!$third_order->isEmpty() && !empty($third_order['request_msg']) && $third_order['third_type']==1){
+            Log::write('取消美团订单'.$work_id);
             $third_order->bookStatus = 3;
             $third_order->save();
             $url = 'https://api-open-cater.meituan.com/ddzh/yuding/merchantcancelorder';
@@ -623,4 +625,67 @@ class ThirdOrderLogic extends BaseLogic
 
     }
 
+    /**
+     * 更新履约状态
+     * @param $work
+     * @return string|void
+     */
+    public static function updateorderfulfillinfo($work,$orderFulfillStatus)
+    {
+        $third_order = ThirdOrders::where('work_id',$work['id'])->findOrEmpty();
+        if(!$third_order->isEmpty() && !empty($third_order['request_msg'])) {
+//        家政/维修更新顺序：已分配（40001）→ 已到达（40002）→ 履约完成（41001）
+            $app_sku_id = ThirdGoods::where('product_id',$third_order['productId'])->value('app_sku_id');
+            //判断当前履约状态
+            $pic_url = 'https://cdnweixiu.kyjlkj.com/uploads/images/20240914/2024091414471041c336653.png';
+            switch ($orderFulfillStatus){
+                case '40001':
+                    $describe = '已分配';
+                    break;
+                case '40002':
+                    $describe = '已到达';
+                    break;
+                case '41001':
+                    $describe = '履约完成';
+                    $pic_url = !empty($work['finished_images'][0])?$work['finished_images'][0]:$pic_url;
+                    break;
+                default:
+                    $describe = '未知';
+                    break;
+            }
+            $url = 'https://api-open-cater.meituan.com/ddzh/yuding/updateorderfulfillinfo';
+            $opBizCode = !empty($third_order['request_msg']) ? json_decode($third_order['request_msg'], true)['opBizCode'] : '';
+            $accessToken = $opBizCode == 'AE7MKOJAV67338LIC3UD0K5TGIO' ? self::shop_token2['accessToken'] : self::shop_token1['accessToken'];
+            $data = [
+                'timestamp' => time(),
+                'appAuthToken' => $accessToken,
+                'charset' => 'utf-8',
+                'version' => '2',
+                'developerId' => self::developerId,
+                'businessId' => 58,
+                'biz' => json_encode([
+                    'orderId' => $third_order['orderId'],
+                    'attrKeyValue' => [
+                        'service_voucher' => [
+                            'detail_list' => [
+                                [
+                                    'app_sku_id' => $app_sku_id,
+                                    'describe' => $describe,
+                                    'pic_url' => $pic_url
+                                ]
+                            ]
+                        ],
+                        'delivery_info' => '无',
+                        'delivery_type' => 3
+                    ],
+                    "type" => 2,
+                    "orderFulfillStatus" => $orderFulfillStatus
+                ], JSON_UNESCAPED_UNICODE)
+            ];
+            $sign_data = self::get_sign(self::assessKey, $data);
+            $data['sign'] = $sign_data;
+            return http_request($url, http_build_query($data));
+        }
+    }
+
 }

app/common/model/group_activity/GroupActivityCategory.php

@@ -0,0 +1,37 @@
+<?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\group_activity;
+
+use app\common\model\BaseModel;
+use think\model\concern\SoftDelete;
+
+
+/**
+ * 拼团活动分类模型
+ * Class GroupActivityCategory
+ * @package app\common\model\group_activity
+ */
+class GroupActivityCategory extends BaseModel
+{
+    use SoftDelete;
+    protected $name = 'group_activity_category';
+    protected $deleteTime = 'delete_time';
+
+    public function getCreateTimeAttr($value,$data)
+    {
+        return !empty($data['create_time'])?date('Y-m-d H:i:s',$data['create_time']):'';
+    }
+    
+}

app/job/AddServiceWorkJob.php

@@ -0,0 +1,125 @@
+<?php
+namespace app\job;
+
+use think\facade\Db;
+use think\queue\Job;
+use think\facade\Log;
+use app\common\enum\WorkEnum;
+use app\common\model\equity\UserEquity;
+use app\common\model\works\ServiceWork;
+use app\common\model\equity\UserEquityLog;
+use app\common\model\orders\RechargeOrder;
+use app\common\model\group_activity\GroupOrder;
+use app\common\model\group_activity\GroupUserOrder;
+
+class AddServiceWorkJob
+{
+    public function fire(Job $job, $data)
+    {
+        
+        $group_order_id = $data['id'];//拼团订单ID
+        $goods = [];
+        try {
+            //查询拼团用户订单
+            $userOrder = GroupUserOrder::alias('a')->leftJoin('user b','a.user_id=b.id')
+                        ->where('group_order_id', $group_order_id)
+                        ->where('pay_status', 1)
+                        ->where('refund_status', 0)
+                        ->field('a.*,b.mobile')
+                        ->select()
+                        ->toArray();
+                        
+            if (empty($userOrder)) {
+                return true;
+            }
+
+            Db::startTrans();
+            foreach ($userOrder as $k => $item) {
+                if (empty($goods)) {
+                    $goods = UserEquity::alias('a')->leftJoin('goods b','a.goods_id=b.id')
+                        ->where('a.id', $item['user_equity_id'])
+                        ->field('a.number,b.goods_name,b.category_type,b.goods_category_ids,b.goods_category_id,b.base_service_fee')
+                        ->findOrEmpty()
+                        ->toArray();
+                }
+                //生成服务工单
+                $work_data = [
+                    'work_sn' => generate_sn(ServiceWork::class, 'work_sn'),
+                    'real_name' => '',
+                    'mobile' => $item['mobile'],
+                    'address' => $item['area'].$item['address'],
+                    'province' => 0,
+                    'city' => 0,
+                    'area_name' => '',
+                    'title' => $goods['goods_name'],
+                    'category_type' => $goods['category_type'],
+                    'goods_category_ids' => $goods['goods_category_ids'],
+                    'goods_category_id' => $goods['goods_category_id'],
+                    'base_service_fee' => $goods['base_service_fee'],
+                    'service_fee' => $item['paid_amount'],
+                    'work_pay_status'=>WorkEnum::IS_PAY_STATUS,
+                    'appointment_time' => time(),
+                    'dispatch_time' => time(),
+                    'receive_time' => time(),
+                    'user_id'=>$item['user_id'],
+                    'lon'=>'',
+                    'lat'=>'',
+                    'property_activity_id'=>0,
+                    'user_equity_id'=>0,
+                    'third_type'=>1,
+                    'work_total'=>$item['paid_amount'],
+                    'work_status' => 5,
+                    'user_confirm_status' => 3,
+                    'service_status' => 1,
+                    'master_worker_id' => 7,
+                    'remark' => '拼团单：'.$item['id'],
+                    'user_equity_id' => $item['user_equity_id'],
+                    'group_order_id' => $item['id'],
+                    'third_type' => 0,
+                ];
+                $service_work = ServiceWork::create($work_data);
+
+                //生成客户订单
+                $data = [
+                    'work_id'=> $service_work['id'],
+                    'sn' => generate_sn(RechargeOrder::class, 'sn'),
+                    'order_type'=>0,//服务订单
+                    'order_terminal' => $item['order_terminal'],
+                    'user_id' => $item['user_id'],
+                    'pay_status' => $item['pay_status'],
+                    'pay_way' => $item['pay_way'],
+                    'order_total' => 0,
+                    'order_amount' => 0,
+                ];
+                $order = RechargeOrder::create($data);
+                //更新用户的权益卡剩余次数
+                UserEquity::where('id', $item['user_equity_id'])->update(['number' => 0, 'update_time' => time()]);
+
+                //记录用户的权益卡使用记录
+                UserEquityLog::create([
+                    'user_id' => $item['user_id'],
+                    'number' => $goods['number'],
+                    'user_equity_id' => $item['user_equity_id'],
+                    'create_time' => time(),
+                ]);
+            }
+
+            GroupOrder::where('id', $group_order_id)->update(['work_status' => 2]);
+            Db::commit();
+            // 任务执行完毕后删除任务
+            $job->delete();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            Log::write("拼团订单批量生成服务工单异常:".$e->getMessage());
+            // 任务执行失败，重试任务
+            if ($job->attempts() > 3) {
+                // 超过最大重试次数，删除任务
+                $job->delete();
+            } else {
+                $job->release(10); // 10 秒后重试
+            }
+            return false;
+        }
+    }
+}

composer.json

@@ -46,7 +46,7 @@
     },
     "autoload": {
         "psr-4": {
-            "app\\": "app"
+            "app\\": "app/"
         },
         "psr-0": {
             "": "extend/"

config/queue.php

@@ -6,12 +6,13 @@ return [
         'redis' => [
             'type'       => 'redis',
             'queue'      => 'default',
-            'host'       => '127.0.0.1',
-            'port'       => 6379,
-            'password'   => '',
+            'host'       => env('redis_host', '127.0.0.1'),
+            'port'       => env('redis_port', 6379),
+            'password'   => env('redis_password', ''),
             'select'     => 0,
-            'timeout'    => 0,
-            'persistent' => false,
+            'timeout'    => 5, // 设置合理的超时时间
+            'persistent' => true, // 可根据需求设置为 true 或 false
         ],
     ],
+    'sleep' => 10, // 队列工作进程在没有新任务时等待 10 秒
 ];