|
|
@@ -41,6 +41,11 @@ class PropertyCommissionLists extends BaseApiDataLists implements ListsSearchInt
|
|
|
['work_id', '=', $item['work_id']],
|
|
|
['payment_type', 'IN', [0,1]]
|
|
|
])->find())['orderGoods'][0];
|
|
|
+ $item['rechargeOrder'] = RechargeOrder::where([
|
|
|
+ ['order_type', '=', 0],
|
|
|
+ ['user_id', '=', $this->userId],
|
|
|
+ ['work_id', '=', $item['work_id']]
|
|
|
+ ])->find();
|
|
|
$item['work_title'] = $item['propertyWork']?$item['propertyWork']['title']:'';
|
|
|
$item['work_create_time'] = $item['propertyWork']?$item['propertyWork']['create_time']:'';
|
|
|
$item['worker_price'] = $item['propertyWork']?$item['propertyWork']['worker_price']:'';
|
|
|
@@ -49,6 +54,7 @@ class PropertyCommissionLists extends BaseApiDataLists implements ListsSearchInt
|
|
|
$item['service_fee'] = $item['propertyWork']?$item['propertyWork']['service_fee']:'';
|
|
|
$item['work_sn'] = $item['propertyWork']?$item['propertyWork']['work_sn']:'';
|
|
|
$item['goods_image'] = $item['orderGoods']?$item['orderGoods']['goods_image']:'';
|
|
|
+ $item['sn'] = $item['rechargeOrder']?$item['rechargeOrder']['sn']:'';
|
|
|
}
|
|
|
return $lists;
|
|
|
}
|