|
|
@@ -441,13 +441,14 @@ class ServiceWorkLogic extends BaseLogic
|
|
|
|
|
|
//搜索当前工单下的所有订单记录
|
|
|
$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']);
|
|
|
+ $query->field('id,sn,goods_id,goods_name,goods_image,goods_number,good_unit,goods_size,goods_payment_type,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']];
|
|
|
@@ -459,6 +460,9 @@ class ServiceWorkLogic extends BaseLogic
|
|
|
$v['order_amount'] = $v['order_amount'] - $result['spare_total'];
|
|
|
}
|
|
|
$coupon_price += $v['coupon_price'];
|
|
|
+
|
|
|
+ //服务支付类别
|
|
|
+ $v['goods_payment_type'] = !empty($v['orderGoods']['goods_payment_type'])?$v['orderGoods']['goods_payment_type']:'';
|
|
|
}
|
|
|
|
|
|
//汇总优惠卷额度
|
whitefang