PPOB/ppob-backend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: history transaction

Browse Source
This commit is contained in:
ilham 2021-12-31 01:11:02 +07:00
parent a30a81cbb6
commit 2dd659ca8e
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/transaction/entities/transactions.entity.ts
View File

@ -50,6 +50,11 @@ export class Transactions extends BaseModel {
}) })
partner_trx_id: string; partner_trx_id: string;
@Column({
nullable: true,
})
seri_number: string;
@Column({ @Column({
nullable: true, nullable: true,
}) })

10
src/transaction/transaction.service.ts
View File

@ -393,7 +393,7 @@ export class TransactionService {
transactionData.product_price = product_price; transactionData.product_price = product_price;
transactionData.destination = orderTransactionDto.destination; transactionData.destination = orderTransactionDto.destination;
transactionData.partner_trx_id = orderTransactionDto.trx_id; transactionData.partner_trx_id = orderTransactionDto.trx_id;
transactionData.partner_trx_id = trxId; transactionData.supplier_trx_id = trxId;
await manager.insert(Transactions, transactionData); await manager.insert(Transactions, transactionData);
await this.accountingTransaction({ await this.accountingTransaction({
@ -709,7 +709,8 @@ export class TransactionService {
relations: ['product_price'], relations: ['product_price'],
}); });
dataTransaction.status = statusTransaction.FAILED; dataTransaction.status = statusTransaction.SUCCESS;
dataTransaction.seri_number = callback['sn'];
dataTransaction.callback_json = callback; dataTransaction.callback_json = callback;
const userData = await this.userService.findExist(dataTransaction.user); const userData = await this.userService.findExist(dataTransaction.user);
@ -899,6 +900,11 @@ export class TransactionService {
.leftJoin('transaction.product_price', 'product_price') .leftJoin('transaction.product_price', 'product_price')
.leftJoin('product_price.product', 'product') .leftJoin('product_price.product', 'product')
.addSelect('transaction.amount', 'price') .addSelect('transaction.amount', 'price')
.addSelect('transaction.destination')
.addSelect('transaction.seri_number','seri_number')
.addSelect('transaction.supplier_trx_id', 'transaction_code')
.addSelect('transaction.status', 'status')
.addSelect('transaction.partner_trx_id', 'partner_transaction_code')
.addSelect('userData.name', 'buyer') .addSelect('userData.name', 'buyer')
.addSelect('product.name', 'name') .addSelect('product.name', 'name')
.addSelect('product.id', 'product_id'); .addSelect('product.id', 'product_id');