Merge remote-tracking branch 'origin/master'

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"));

src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml

@@ -168,7 +168,7 @@
     </select>
     <select id="passPartners" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        company_name,short_name,client_moniker,alipayindustry,address,suburb,state,postcode,business_hours,company_phone,merchant_introduction
+        company_name,short_name,client_moniker,ali_sub_merchant_id,alipayindustry,address,suburb,state,postcode,business_hours,company_phone,merchant_introduction
         from sys_clients
         <where>
             (approve_result=1 or (approve_result=2 and (source=1 or source=2)))