fix: get deposit return to
This commit is contained in:
parent
4b8278a6bb
commit
25308eb67f
|
@ -14,6 +14,8 @@ import { BaseModel } from '../../config/basemodel.entity';
|
||||||
import { statusTransaction, typeTransaction } from '../../helper/enum-list';
|
import { statusTransaction, typeTransaction } from '../../helper/enum-list';
|
||||||
import { Partner } from '../../users/entities/partner.entity';
|
import { Partner } from '../../users/entities/partner.entity';
|
||||||
import { ProductHistoryPrice } from '../../product/entities/product-history-price.entity';
|
import { ProductHistoryPrice } from '../../product/entities/product-history-price.entity';
|
||||||
|
import { User } from '../../users/entities/user.entity';
|
||||||
|
import { UserDetail } from '../../users/entities/user_detail.entity';
|
||||||
|
|
||||||
@Entity()
|
@Entity()
|
||||||
export class Transactions extends BaseModel {
|
export class Transactions extends BaseModel {
|
||||||
|
@ -26,7 +28,10 @@ export class Transactions extends BaseModel {
|
||||||
@Column()
|
@Column()
|
||||||
type: typeTransaction;
|
type: typeTransaction;
|
||||||
|
|
||||||
@Column()
|
@Column({
|
||||||
|
type: 'uuid',
|
||||||
|
nullable: true,
|
||||||
|
})
|
||||||
user: string;
|
user: string;
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
|
@ -43,4 +48,6 @@ export class Transactions extends BaseModel {
|
||||||
image_prove: string;
|
image_prove: string;
|
||||||
|
|
||||||
mark_up_price: number;
|
mark_up_price: number;
|
||||||
|
|
||||||
|
userData: UserDetail;
|
||||||
}
|
}
|
||||||
|
|
|
@ -677,8 +677,6 @@ export class TransactionService {
|
||||||
) {
|
) {
|
||||||
const baseQuery = this.transactionRepository
|
const baseQuery = this.transactionRepository
|
||||||
.createQueryBuilder('transaction')
|
.createQueryBuilder('transaction')
|
||||||
.select('transaction.id', 'id')
|
|
||||||
.addSelect(['transaction.created_at', 'image_prove', 'amount'])
|
|
||||||
.where('transaction.user_destination = :id and transaction.type = 3', {
|
.where('transaction.user_destination = :id and transaction.type = 3', {
|
||||||
id: user,
|
id: user,
|
||||||
})
|
})
|
||||||
|
@ -688,7 +686,14 @@ export class TransactionService {
|
||||||
'userData',
|
'userData',
|
||||||
'userData.user = transaction.user',
|
'userData.user = transaction.user',
|
||||||
)
|
)
|
||||||
.addSelect('userData.name', 'name');
|
.select('transaction.id', 'id')
|
||||||
|
.addSelect([
|
||||||
|
'transaction.created_at',
|
||||||
|
'image_prove',
|
||||||
|
'amount',
|
||||||
|
'status',
|
||||||
|
'userData.name',
|
||||||
|
]);
|
||||||
|
|
||||||
const data = await baseQuery
|
const data = await baseQuery
|
||||||
.offset(page * (pageSize || 10))
|
.offset(page * (pageSize || 10))
|
||||||
|
|
Loading…
Reference in New Issue
Block a user