Merge branch 'master' into dongxiaoqin_0220

app/adminapi/controller/works/ServiceWorkController.php

@@ -216,5 +216,17 @@ class ServiceWorkController extends BaseAdminController
         }
         return $this->fail(ServiceWorkLogic::getError());
     }
-
+    /**
+     * 手动添加工单到第三方平台 (暂时只有美团)
+     * @return \think\response\Json
+     */
+    public function addThirdPlatformsOrders()
+    {
+        $params = request()->post();
+        $result = ServiceWorkLogic::addThirdPlatformsOrders($params);
+        if (false === $result) {
+            return $this->fail(ServiceWorkLogic::getError());
+        }
+        return $this->success('添加成功', [], 1, 1);
+    }
 }

app/adminapi/lists/goods/GoodsLists.php

@@ -78,6 +78,9 @@ class GoodsLists extends BaseAdminDataLists implements ListsSearchInterface
             // 筛选已选过的
             $where[] = ['is_activity','=' ,1];//100000
         }
+        if (isset($this->params['platforms']) && !empty($this->params['platforms'])) {
+            $where[] = [ 'platform_value','>',0];
+        }
         return $where;
     }
 

app/adminapi/lists/training/TrainingWorkerCourseLists.php

@@ -16,6 +16,7 @@ namespace app\adminapi\lists\training;
 
 
 use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\goods_category\GoodsCategory;
 use app\common\model\training\TrainingWorkerCourse;
 use app\common\lists\ListsSearchInterface;
 
@@ -56,12 +57,20 @@ class TrainingWorkerCourseLists extends BaseAdminDataLists implements ListsSearc
      */
     public function lists(): array
     {
-        return TrainingWorkerCourse::with(['trainingCourse','masterWorker','trainingTask'])->where($this->searchWhere)
-            ->field(['id', 'master_worker_id', 'training_task_id', 'training_course_id', 'play_time', 'exam_start_time', 'exam_end_time', 'study_status', 'exam_score'])
+        $lists = TrainingWorkerCourse::with(['goodsCategory','trainingCourse','masterWorker','trainingTask'])->where($this->searchWhere)
+            ->field(['*'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()
             ->toArray();
+        foreach ($lists as &$item) {
+            if($item['goodsCategory']){
+                $item['category_id_text'] = $item['goodsCategory']['name'];
+                $item['category_two_text'] = GoodsCategory::where('id',$item['goodsCategory']['pid']??0)->value('name')??'';
+                $item['category_three_text'] = GoodsCategory::where('id',GoodsCategory::where('id',$item['goodsCategory']['pid'])->value('pid')??0)->value('name')??'';
+            }
+        }
+        return $lists;
     }
 
 

app/adminapi/logic/works/ServiceWorkLogic.php

@@ -14,6 +14,7 @@
 
 namespace app\adminapi\logic\works;
 
+use app\api\logic\ThirdOrderLogic;
 use think\Exception;
 use think\db\Query;
 use think\facade\Db;
@@ -973,4 +974,17 @@ class ServiceWorkLogic extends BaseLogic
         }
     }
 
+    /**
+     * 添加第三方平台订单
+     * @return false|void
+     */
+    public static function addThirdPlatformsOrders($params)
+    {
+        try {
+            return ThirdOrderLogic::submitOrders($params);
+        }catch  (\Exception $e) {
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
 }

app/api/logic/ServiceOrderLogic.php

@@ -1238,7 +1238,11 @@ class ServiceOrderLogic extends BaseLogic
             if($work->isEmpty()){
                 throw new Exception('工单不存在');
             }
-            if($work['work_status']!=WorkEnum::WORK_STATUS_WAIT_SERVICE){
+            /*if($work['work_status']!=WorkEnum::WORK_STATUS_WAIT_SERVICE){
+                throw new Exception('工单状态不正确，无法绑定');
+            }*/
+            // 20250310 未上门状态强转新工程师
+            if((int)$work['work_status'] > 3){
                 throw new Exception('工单状态不正确，无法绑定');
             }
             $worker = MasterWorker::where('id',$params['worker_id'])->findOrEmpty();

app/common/model/training/TrainingWorkerCourse.php

@@ -16,6 +16,7 @@ namespace app\common\model\training;
 
 
 use app\common\model\BaseModel;
+use app\common\model\goods_category\GoodsCategory;
 use app\common\model\master_worker\MasterWorker;
 
 
@@ -42,6 +43,9 @@ class TrainingWorkerCourse extends BaseModel
         return $this->hasOne(TrainingTask::class, 'id', 'training_task_id');
     }
 
-
+    public function goodsCategory()
+    {
+        return $this->hasOne(GoodsCategory::class,'id','subclass');
+    }
 
 }