Merge remote-tracking branch 'origin/master'

app/api/controller/IssueWorkController.php

@@ -57,6 +57,10 @@ class IssueWorkController extends BaseApiController
 
     public function complaintInfo()
     {
-
+        $params = (new IssueWorkValidate())->goCheck('detail', [
+            'user_id' => $this->userId,
+        ]);
+        $result = IssueWorkLogic::detail($params);
+        return $this->data($result);
     }
 }

app/api/logic/IssueWorkLogic.php

@@ -69,6 +69,11 @@ class IssueWorkLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return IssueWork::findOrEmpty($params['id'])->toArray();
+        $issue_work = IssueWork::where(['id'=>$params['id'],'user_id'=>$params['user_id']])
+            ->field('sn,work_sn,issue_approval,complaint_type,complaint_details,complaint_images,complaint_mobile,finished_time,create_time')->findOrEmpty()->toArray();
+        if(!empty($issue_work)){
+            $issue_work['complaint_type'] = DictData::where(['type_value'=>'complaint_type','status'=>1])->whereIn('value',$issue_work['complaint_type'])->column('name');
+        }
+        return $issue_work;
     }
 }

app/api/validate/IssueWorkValidate.php

@@ -20,6 +20,7 @@ class IssueWorkValidate extends BaseValidate
         'sn' => 'require',
         'complaint_type' => 'require',
         'complaint_details'=>'require',
+        'id'=>'require'
     ];
 
 
@@ -31,6 +32,7 @@ class IssueWorkValidate extends BaseValidate
         'sn' => '订单编号',
         'complaint_type' => '投诉类别',
         'complaint_details' => '投诉详情',
+        'id'=>'参数'
     ];
 
     /**
@@ -41,4 +43,9 @@ class IssueWorkValidate extends BaseValidate
     {
         return $this->only(['sn','complaint_type','complaint_details']);
     }
+
+    public function sceneDetail()
+    {
+        return $this->only(['id']);
+    }
 }

app/common/model/works/IssueWork.php

@@ -28,8 +28,6 @@ class IssueWork extends BaseModel
 {
     
     protected $name = 'issue_work';
-    
-
     public function getComplaintImagesAttr($value)
     {
         return empty($value)?'':json_decode($value,true);

app/workerapi/logic/MasterWorkerLogic.php

@@ -3,6 +3,8 @@ namespace app\workerapi\logic;
 use app\common\enum\YesNoEnum;
 use app\common\logic\BaseLogic;
 use app\common\model\master_worker\MasterWorker;
+use app\common\model\master_worker\MasterWorkerAccountLog;
+use app\common\model\works\ServiceWork;
 use think\facade\Config;
 
 /**
@@ -83,9 +85,16 @@ class MasterWorkerLogic extends  BaseLogic
 
      public static function detail($userId): array
     {
-        return MasterWorker::field('id,sn,avatar,real_avatar,real_name,nickname,account,mobile,sex,estimate_money,user_money,earnest_money,exp')
+        $worker = MasterWorker::field('id,sn,avatar,real_avatar,real_name,nickname,account,mobile,sex,estimate_money,user_money,earnest_money,exp')
             ->findOrEmpty($userId)
-
             ->toArray();
+
+        //今日收益
+        $worker['account_today'] = MasterWorkerAccountLog::where(['worker_id'=> $worker['id'],'action'=>1])->whereTime('create_time', 'today')->sum('change_amount');
+        //本月成功订单
+        $worker['success_work'] = ServiceWork::where(['master_worker_id'=>$worker['id'],'service_status'=>3])->whereTime('create_time', 'month')->count();
+        //本月失败单
+        $worker['fail_work'] = ServiceWork::where(['master_worker_id'=>$worker['id'],'service_status'=>4])->whereTime('create_time', 'month')->count();
+        return $worker;
     }
 }