Merge remote-tracking branch 'origin/duel_settlement' into duel_settlement

This commit is contained in:
kizzy 2026-04-01 16:40:31 +07:00
commit 5c036eb954

View File

@ -1422,6 +1422,7 @@ public abstract class BaseXPrint {
String transType = payDetail.getTransType();
String batchNum = "";
String traceNum = payDetail.getVoucherNo();
boolean isDuelCurrency = SystemParamsOperation.getInstance().getDuelCurrencyStatus();
String currencySign = currencyCodeToText(payDetail.getCurrencyCode());
boolean isSettlement = payDetail.getTransactionType() == TransactionsType.SETTLEMENT.value;
@ -1448,6 +1449,10 @@ public abstract class BaseXPrint {
}else{
printer.appendPrnStr("MID :" + payDetail.getMerchantNo(), fontNormal, AlignEnum.LEFT,false);
printer.appendPrnStr("TID :" + payDetail.getTerminalNo(), fontNormal, AlignEnum.LEFT,false);
if(isDuelCurrency){
printer.appendPrnStr("MID :" + safe(SystemParamsOperation.getInstance().getThirdHostMerchantId()), fontNormal, AlignEnum.LEFT, false);
printer.appendPrnStr("TID :" + safe(SystemParamsOperation.getInstance().getThirdHostTerminalId()), fontNormal, AlignEnum.LEFT, false);
}
}
if(isSettlement) {