订单详情

app/adminapi/logic/works/ServiceWorkLogic.php

@@ -15,6 +15,7 @@
 namespace app\adminapi\logic\works;
 
 
+use app\common\model\dict\DictData;
 use app\common\model\master_worker\MasterWorker;
 use app\common\model\recharge\RechargeOrder;
 use app\common\model\works\ServiceWork;
@@ -295,18 +296,25 @@ class ServiceWorkLogic extends BaseLogic
      */
     public static function detail($params){
         try {
-            return ServiceWork::with([
+            $result = ServiceWork::with([
                 'worker'=> function(Query $query) {
                     $query->field('id,worker_number,real_name');
-                },
-                'rechargeOrder'=>function(Query $query){
-                    $query->visible(['id','sn','order_total','order_amount','pay_status','create_time','title','work_id'])->append(['pay_status_text','payment_type_text'])->order(['id'=>'desc']);
-                    $query->with(['orderGoods'=>function(Query $query){
-                        $query->visible(['goods_name','goods_image','goods_number','good_unit']);
-                    }]);
                 }
-            ])->append(['work_status_text','service_status_text'])
+            ])->append(['id','work_status_text','service_status_text'])
                 ->findOrEmpty($params['id'])->toArray();
+
+            //搜索当前工单下的所有订单记录
+            $result['pay_orders'] = RechargeOrder::where(['work_id'=>$result['id']])->field('id as order_id, pay_status,payment_type,pay_way,pay_time,order_amount')->order('id asc')->select()->toArray();
+            $pay_status_data = DictData::where('type_value','pay_status')->column('name','value');
+            $payment_type_data = DictData::where('type_value','payment_type')->column('name','value');
+            $pay_way_data = DictData::where('type_value','pay_way')->column('name','value');
+            foreach ($result['pay_orders'] as $k=>&$v){
+                $v['pay_status_name'] = $pay_status_data[$v['pay_status']];
+                $v['payment_type_name'] = $payment_type_data[$v['payment_type']];
+                $v['pay_way_name'] = $pay_way_data[$v['pay_way']];
+            }
+
+            return  $result;
         }catch(\Exception $e){
             Db::rollback();
             self::setError($e->getMessage());