工单展示处理

app/adminapi/controller/works/ReturnWorkController.php

@@ -112,7 +112,7 @@ class ReturnWorkController extends BaseAdminController
      */
     public function issueWorkData()
     {
-        $params = (new ReturnWorkValidate())->goCheck('issueWorkData');
+        $params = (new ReturnWorkValidate())->post()->goCheck('issueWorkData');
         $result = ReturnWorkLogic::issueWorkData($params);
         if (true === $result) {
             return $this->success('成功', [], 1, 1);

app/adminapi/lists/orders/RechargeOrderLists.php

@@ -18,6 +18,7 @@ namespace app\adminapi\lists\orders;
 use app\adminapi\lists\BaseAdminDataLists;
 use app\common\model\orders\RechargeOrder;
 use app\common\lists\ListsSearchInterface;
+use think\db\Query;
 
 
 /**
@@ -55,7 +56,9 @@ class RechargeOrderLists extends BaseAdminDataLists implements ListsSearchInterf
      */
     public function lists(): array
     {
-        return RechargeOrder::where($this->searchWhere)
+        return RechargeOrder::with(['orderGoods'=>function(Query $query){
+            $query->field('id,sn,goods_id,goods_name,goods_image,goods_number,good_unit,goods_size,goods_type,goods_brand,base_service_fee,service_total,service_fee')->order(['id'=>'desc']);
+        }])->where($this->searchWhere)
             ->field(['id', 'sn', 'work_id', 'user_id', 'payment_type', 'pay_sn', 'pay_way', 'pay_status', 'pay_time', 'order_total', 'order_amount', 'order_terminal', 'transaction_id', 'refund_status', 'refund_transaction_id', 'create_time', 'update_time'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])

app/adminapi/logic/works/ServiceWorkLogic.php

@@ -368,15 +368,20 @@ class ServiceWorkLogic extends BaseLogic
 
 
             //搜索当前工单下的所有订单记录
-            $result['pay_orders'] = RechargeOrder::where(['work_id'=>$result['id']])->field('id as order_id, pay_status,payment_type,pay_way,pay_time,order_amount,coupon_price')->order('id asc')->select()->toArray();
+            $result['pay_orders'] = RechargeOrder::with(['orderGoods'=>function(Query $query){
+                $query->field('id,sn,goods_id,goods_name,goods_image,goods_number,good_unit,goods_size,goods_type,goods_brand,base_service_fee,service_total,service_fee')->order(['id'=>'desc']);
+            }])->where(['work_id'=>$result['id']])->field('id as order_id,sn,order_type,pay_status,payment_type,pay_way,pay_time,order_amount,order_total,coupon_price,create_time')->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');
+            $order_type_data = DictData::where('type_value','order_type')->column('name','value');
             $coupon_price = 0;
             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']];
+                $v['order_type_name'] = $order_type_data[$v['order_type']];
+                $v['pay_time'] = $v['pay_time'] && is_numeric($v['pay_time']) ? date('Y-m-d H:i:s',$v['pay_time']):'';
                 $coupon_price += $v['coupon_price'];
             }
 

app/api/controller/ReturnWorkController.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace app\api\controller;
+
+
+
+use app\api\logic\ReturnWorkLogic;
+
+class ReturnWorkController extends BaseApiController
+{
+    public function lists()
+    {
+        $params['user_id'] = $this->userId;
+        $result = ReturnWorkLogic::lists($params);
+        return $this->data($result);
+    }
+}

app/api/logic/ReturnWorkLogic.php

@@ -0,0 +1,24 @@
+<?php
+namespace app\api\logic;
+use app\common\logic\BaseLogic;
+use app\common\model\works\ReturnWork;
+use think\db\Query;
+
+/**
+ * @author 林海涛
+ * @date 2024/7/29 下午4:26
+ */
+class ReturnWorkLogic extends BaseLogic
+{
+    public static function lists($params)
+    {
+        return ReturnWork::with(['serviceWork'=>function(Query $query){
+            $query->field('id,address,title');
+        }])->where('user_id',$params['user_id'])
+            ->field(['id', 'work_sn','service_work_id','return_work_status','dispatch_time','create_time'])
+            ->append(['return_work_status_text'])
+            ->order(['id' => 'desc'])
+            ->select()
+            ->toArray();
+    }
+}