工单+订单支付

app/api/controller/RechargeController.php

@@ -27,7 +27,7 @@ class RechargeController extends BaseApiController
 {
 
     /**
-     * @notes 获取充值列表
+     * @notes 充值列表
      * @return \think\response\Json
      */
     public function lists()

app/api/controller/ServiceOrderController.php

@@ -1,6 +1,7 @@
 <?php
 namespace app\api\controller;
 
+use app\api\lists\recharge\ServiceOrderLists;
 use app\api\logic\ServiceOrderLogic;
 use app\api\validate\ServiceOrderValidate;
 
@@ -9,6 +10,11 @@ use app\api\validate\ServiceOrderValidate;
  */
 class ServiceOrderController extends BaseApiController
 {
+    public function lists()
+    {
+        return $this->dataLists(new ServiceOrderLists());
+    }
+
     public function submitOrder()
     {
         $params = (new ServiceOrderValidate())->post()->goCheck('add', [

app/api/lists/recharge/RechargeLists.php

@@ -1,24 +1,10 @@
 <?php
-// +----------------------------------------------------------------------
-// | likeadmin快速开发前后端分离管理后台（PHP版）
-// +----------------------------------------------------------------------
-// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
-// | 开源版本可自由商用，可去除界面版权logo
-// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
-// | github下载：https://github.com/likeshop-github/likeadmin
-// | 访问官网：https://www.likeadmin.cn
-// | likeadmin团队 版权所有 拥有最终解释权
-// +----------------------------------------------------------------------
-// | author: likeadminTeam
-// +----------------------------------------------------------------------
-
 namespace app\api\lists\recharge;
 
 use app\api\lists\BaseApiDataLists;
 use app\common\enum\PayEnum;
 use app\common\model\recharge\RechargeOrder;
 
-
 /**
  * 充值记录列表
  * Class RechargeLists
@@ -39,16 +25,10 @@ class RechargeLists extends BaseApiDataLists
             ->where([
                 'order_type' => 1,
                 'user_id' => $this->userId,
-                'pay_status' => PayEnum::ISPAID
             ])
             ->order('id', 'desc')
             ->select()
             ->toArray();
-
-        foreach($lists as &$item) {
-            $item['tips'] = '充值' . format_amount($item['order_amount']) . '元';
-        }
-
         return $lists;
     }
 
@@ -62,7 +42,6 @@ class RechargeLists extends BaseApiDataLists
         return RechargeOrder::where([
                 'order_type' => 1,
                 'user_id' => $this->userId,
-                'pay_status' => PayEnum::ISPAID
             ])
             ->count();
     }

app/api/lists/recharge/ServiceOrderLists.php

@@ -0,0 +1,67 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\api\lists\recharge;
+
+use app\api\lists\BaseApiDataLists;
+use app\common\enum\PayEnum;
+use app\common\model\recharge\RechargeOrder;
+
+/**
+ * 服务订单列别
+ * Class RechargeLists
+ * @package app\api\lists\recharge
+ */
+class ServiceOrderLists extends BaseApiDataLists
+{
+    /**
+     * @notes 获取列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function lists(): array
+    {
+        $lists = RechargeOrder::with(['order_goods'=>function ($query) {
+            $query->visible(['goods_name','goods_image','goods_number','good_unit']);
+        },'service_work'=>function ($query) {
+            $query->visible(['service_status']);
+        }])
+            ->visible(['id','sn','order_total','order_amount','pay_status','create_time'])
+            ->where([
+                'order_type' => 0,
+                'user_id' => $this->userId,
+            ])
+            ->order('id', 'desc')
+            ->select()
+            ->toArray();
+        return $lists;
+    }
+
+
+    /**
+     * @notes  获取数量
+     * @return int
+     */
+    public function count(): int
+    {
+        return RechargeOrder::where([
+                'order_type' => 0,
+                'user_id' => $this->userId,
+            ])
+            ->count();
+    }
+
+}

app/common/model/recharge/RechargeOrder.php

@@ -16,10 +16,11 @@ namespace app\common\model\recharge;
 
 use app\common\enum\PayEnum;
 use app\common\model\BaseModel;
+use app\common\model\works\ServiceWork;
 use think\model\concern\SoftDelete;
 
 /**
- * 充值订单模型
+ * 订单模型
  * Class RechargeOrder
  * @package app\common\model
  */
@@ -54,4 +55,14 @@ class RechargeOrder extends BaseModel
     {
         return PayEnum::getPayStatusDesc($data['pay_status']);
     }
+
+    public function serviceWork()
+    {
+        return $this->belongsTo(ServiceWork::class, 'work_id', 'id');
+    }
+
+    public function orderGoods()
+    {
+        return $this->hasOne(OrderGoods::class, 'sn', 'sn');
+    }
 }