diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java index 845c76876..ca6b5b381 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java @@ -48,7 +48,11 @@ public class AliforexcelServiceImpl implements AliforexcelService { row = sheet.createRow(++rowNum); row.createCell(0, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("company_name")); row.createCell(1, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("short_name")); - row.createCell(2, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("client_moniker")); + if (!"".equals(partner.getString("ali_sub_merchant_id"))) { + row.createCell(2, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("ali_sub_merchant_id")); + }else { + row.createCell(2, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("client_moniker")); + } row.createCell(3, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("alipayindustry")); row.createCell(4, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("address")+","+partner.getString("suburb") + "," + partner.getString("state") + "," + partner.getString("postcode")); row.createCell(5, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("business_hours")); diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml index ef9a4a2ff..24bfc3a90 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml @@ -168,7 +168,7 @@