Merge remote-tracking branch 'origin/duel_settlement' into duel_settlement
This commit is contained in:
commit
5c036eb954
@ -1422,6 +1422,7 @@ public abstract class BaseXPrint {
|
|||||||
String transType = payDetail.getTransType();
|
String transType = payDetail.getTransType();
|
||||||
String batchNum = "";
|
String batchNum = "";
|
||||||
String traceNum = payDetail.getVoucherNo();
|
String traceNum = payDetail.getVoucherNo();
|
||||||
|
boolean isDuelCurrency = SystemParamsOperation.getInstance().getDuelCurrencyStatus();
|
||||||
|
|
||||||
String currencySign = currencyCodeToText(payDetail.getCurrencyCode());
|
String currencySign = currencyCodeToText(payDetail.getCurrencyCode());
|
||||||
boolean isSettlement = payDetail.getTransactionType() == TransactionsType.SETTLEMENT.value;
|
boolean isSettlement = payDetail.getTransactionType() == TransactionsType.SETTLEMENT.value;
|
||||||
@ -1448,6 +1449,10 @@ public abstract class BaseXPrint {
|
|||||||
}else{
|
}else{
|
||||||
printer.appendPrnStr("MID :" + payDetail.getMerchantNo(), fontNormal, AlignEnum.LEFT,false);
|
printer.appendPrnStr("MID :" + payDetail.getMerchantNo(), fontNormal, AlignEnum.LEFT,false);
|
||||||
printer.appendPrnStr("TID :" + payDetail.getTerminalNo(), 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) {
|
if(isSettlement) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user