|
|
@@ -46,12 +46,12 @@ func (r *PaymentRepository) List(q PaymentListQuery) ([]PaymentListResult, int64
|
|
|
db := global.GVA_DB.Table("payment_record").
|
|
|
Select(`payment_record.id, vehicle_record.plate_number, vehicle_type.name as vehicle_type, payment_record.payment_method,
|
|
|
payment_record.amount, payment_record.paid_amount, payment_record.change_amount,
|
|
|
- payment_record.operator_id, sys_user.nick_name as operator_name, vehicle_record.parking_lot_id, parking_lot.lot_name as parking_lot, payment_record.paid_at,
|
|
|
+ payment_record.operator_id, sys_users.nick_name as operator_name, vehicle_record.parking_lot_id, parking_lot.lot_name as parking_lot, payment_record.paid_at,
|
|
|
vehicle_record.entry_time, vehicle_record.exit_time, vehicle_record.stay_time`).
|
|
|
Joins("LEFT JOIN vehicle_record ON vehicle_record.id = payment_record.record_id").
|
|
|
Joins("LEFT JOIN vehicle ON vehicle.plate_number = vehicle_record.plate_number").
|
|
|
Joins("LEFT JOIN vehicle_type ON vehicle_type.id = vehicle.vehicle_type_id").
|
|
|
- Joins("LEFT JOIN sys_user ON sys_user.id = payment_record.operator_id").
|
|
|
+ Joins("LEFT JOIN sys_users ON sys_users.id = payment_record.operator_id").
|
|
|
Joins("LEFT JOIN parking_lot ON parking_lot.id = vehicle_record.parking_lot_id")
|
|
|
|
|
|
if q.PlateNumber != "" {
|
