whitefang 1 рік тому
батько
коміт
d65571894a

+ 2 - 3
app/adminapi/logic/works/ServiceWorkLogic.php

@@ -298,12 +298,11 @@ class ServiceWorkLogic extends BaseLogic
             return ServiceWork::with([
                 'worker'=> function(Query $query) {
                     $query->field('id,worker_number,real_name');
-//                $query->with('workerRegister');
                 },
                 'rechargeOrder'=>function(Query $query){
-                    $query->field('id,order_type,work_id,sn,refund_status,pay_status,pay_time,order_total,order_amount,create_time,update_time')->order(['id'=>'desc']);
+                    $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->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']);
+                        $query->visible(['goods_name','goods_image','goods_number','good_unit']);
                     }]);
                 }
             ])->append(['work_status_text','service_status_text'])

+ 8 - 0
app/common/model/recharge/RechargeOrder.php

@@ -16,6 +16,7 @@ namespace app\common\model\recharge;
 
 use app\common\enum\PayEnum;
 use app\common\model\BaseModel;
+use app\common\model\dict\DictData;
 use app\common\model\works\ServiceWork;
 use think\model\concern\SoftDelete;
 
@@ -65,4 +66,11 @@ class RechargeOrder extends BaseModel
     {
         return $this->hasMany(OrderGoods::class, 'sn', 'sn');
     }
+
+    public function getPaymentTypeTextAttr($value, $data)
+    {
+        $payment_type_data = DictData::where('type_value','payment_type')->column('name','value');
+        return $payment_type_data[$data['payment_type']];
+    }
+
 }