add - 租户、培训

app/adminapi/lists/training/TrainingWorkerTaskLists.php

@@ -62,7 +62,7 @@ class TrainingWorkerTaskLists extends BaseAdminDataLists implements ListsSearchI
                 'ShopGoods',
                 'ShopOrders',
             ])->where($this->searchWhere)
-            ->field(['id', 'master_worker_id', 'shop_goods_id', 'shop_orders_id', 'training_task_id', 'training_status', 'lead_master_worker_id', 'operate_status'])
+            ->field(['id', 'task_list','master_worker_id', 'shop_goods_id', 'shop_orders_id', 'training_task_id', 'training_status', 'lead_master_worker_id', 'operate_status'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()

app/adminapi/logic/sale/SaleLogic.php

@@ -17,6 +17,7 @@ namespace app\adminapi\logic\sale;
 
 use app\common\model\sale\Sale;
 use app\common\logic\BaseLogic;
+use think\facade\Config;
 use think\facade\Db;
 
 
@@ -40,10 +41,15 @@ class SaleLogic extends BaseLogic
     {
         Db::startTrans();
         try {
+
+            $passwordSalt = Config::get('project.unique_identification');
+            $password = create_password($params['password'], $passwordSalt);
+
             Sale::create([
                 'sale_group_id' => $params['sale_group_id'],
                 'sale_name' => $params['sale_name'],
                 'mobile' => $params['mobile'],
+                'password' => $password,
             ]);
 
             Db::commit();
@@ -67,11 +73,17 @@ class SaleLogic extends BaseLogic
     {
         Db::startTrans();
         try {
-            Sale::where('id', $params['id'])->update([
+            $up_data = [
                 'sale_group_id' => $params['sale_group_id'],
                 'sale_name' => $params['sale_name'],
                 'mobile' => $params['mobile'],
-            ]);
+            ];
+            if(!empty($params['password'])){
+                $passwordSalt = Config::get('project.unique_identification');
+                $password = create_password($params['password'], $passwordSalt);
+                $up_data['password'] = $password;
+            }
+            Sale::where('id', $params['id'])->update($up_data);
 
             Db::commit();
             return true;

app/adminapi/logic/training/TrainingWorkerTaskLogic.php

@@ -42,6 +42,8 @@ class TrainingWorkerTaskLogic extends BaseLogic
      */
     public static function add(array $params): bool
     {
+
+
         Db::startTrans();
         try {
             TrainingWorkerTask::create([
@@ -50,6 +52,7 @@ class TrainingWorkerTaskLogic extends BaseLogic
                 'training_task_id' => $params['training_task_id'],
                 'lead_master_worker_id' => $params['lead_master_worker_id'],
                 'operate_status' => $params['operate_status']??0,
+                'task_list' => $params['task_list']??'',
             ]);
 
             // 添加该工程师初始化记录
@@ -82,6 +85,7 @@ class TrainingWorkerTaskLogic extends BaseLogic
                 'training_task_id' => $params['training_task_id'],
                 'lead_master_worker_id' => $params['lead_master_worker_id'],
                 'operate_status' => $params['operate_status']??0,
+                'task_list' => $params['task_list']?json_encode($params['task_list']):'',
             ]);
 
             Db::commit();

app/adminapi/validate/training/TrainingWorkerTaskValidate.php

@@ -68,7 +68,7 @@ class TrainingWorkerTaskValidate extends BaseValidate
      */
     public function sceneAdd()
     {
-        return $this->only(['master_worker_id','shop_goods_id','training_task_id']);
+        return $this->only(['master_worker_id']);
     }
 
 
@@ -80,7 +80,7 @@ class TrainingWorkerTaskValidate extends BaseValidate
      */
     public function sceneEdit()
     {
-        return $this->only(['id','master_worker_id','shop_goods_id','training_task_id']);
+        return $this->only(['id','master_worker_id']);
     }
 
 

app/common/model/training/TrainingWorkerTask.php

@@ -30,6 +30,9 @@ class TrainingWorkerTask extends BaseModel
 {
     
     protected $name = 'training_worker_task';
+    protected $type = [
+        'task_list' => 'array',
+    ];
     public function TrainingTask(){
         return $this->hasOne(TrainingTask::class,'id','training_task_id');
     }

app/tenantapi/logic/master_worker/MasterWorkerLogic.php

@@ -18,6 +18,7 @@ namespace app\tenantapi\logic\master_worker;
 use app\common\model\master_worker\MasterWorker;
 use app\common\logic\BaseLogic;
 use app\common\model\master_worker\MasterWorkerRetentionMoneyLog;
+use app\common\model\master_worker\MasterWorkerTeam;
 use app\common\model\master_worker_register\MasterWorkerRegister;
 use app\common\service\ConfigService;
 use think\db\Query;
@@ -53,6 +54,7 @@ class MasterWorkerLogic extends BaseLogic
         Db::startTrans();
         try {
 
+            $params['team_id'] = MasterWorkerTeam::where('tenant_id',$params['tenant_id'])->value('id')??"";
             $number = MasterWorker::count();
             $number += 1;
             if ($number < 100000) {
@@ -103,6 +105,8 @@ class MasterWorkerLogic extends BaseLogic
                 'labels' => (isset($params['labels']) && $params['labels'])?implode(',',$params['labels']):'',
                 'remark' => $params['remark']??'',
                 'tenant_id' => $params['tenant_id'],
+                'team_id' => $params['team_id']??0,
+                'team_role' => 2,
                 'audit_state' => 1,
             ]);
 
@@ -156,7 +160,7 @@ class MasterWorkerLogic extends BaseLogic
         }
         Db::startTrans();
         try {
-
+            $params['team_id'] = MasterWorkerTeam::where('tenant_id',$params['tenant_id'])->value('id')??"";
             MasterWorker::where('id', $params['id'])->update([
                 'sn' => $params['sn'],
                 'avatar' => $params['avatar'],
@@ -196,6 +200,8 @@ class MasterWorkerLogic extends BaseLogic
                 'labels' => (isset($params['labels']) && $params['labels'])?implode(',',$params['labels']):'',
                 'remark' => $params['remark']??'',
                 'tenant_id' => $params['tenant_id'],
+                'team_id' => $params['team_id']??0,
+                'team_role' => 2,
             ]);
             Db::commit();
             return true;

app/workerapi/logic/TrainingLogic.php

@@ -46,7 +46,7 @@ class TrainingLogic extends  BaseLogic
                 $task_info['category_status'] = empty($masterWorker['category_ids'])?0:1;
                 $task_info['service_status'] = (empty($masterWorker['lon']) || empty($masterWorker['lat']))?0:1;
             }
-            $task_info['free_videos'] = TrainingCourse::where('course_lock',1)->select()->toArray();
+            //$task_info['free_videos'] = TrainingCourse::where('course_lock',1)->select()->toArray();
             return $task_info;
         } catch (\Exception $e) {
             self::setError($e->getMessage());