Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage

src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java

@@ -54,16 +54,16 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService {
     @Override
     public JSONObject getChannelSettleLog(String channel) {
         JSONObject sysLogs = new JSONObject();
-        JSONObject creditLogs = platformSettlementMapper.calculateSysSettleLog5("2018-02-05 02:00:00", sdfNormal.format(new Date()), channel, "Credit");
+        JSONObject creditLogs = platformSettlementMapper.calculateSysSettleLog5("2018-04-05 02:00:00", sdfNormal.format(new Date()), channel, "Credit");
         sysLogs.put("sys_pay_fee", creditLogs.getBigDecimal("rmb_amount"));
 
-        JSONObject debitLogs = platformSettlementMapper.calculateSysSettleLog5("2018-02-05 02:00:00", sdfNormal.format(new Date()), channel, "Debit");
+        JSONObject debitLogs = platformSettlementMapper.calculateSysSettleLog5("2018-04-05 02:00:00", sdfNormal.format(new Date()), channel, "Debit");
         sysLogs.put("sys_refund_fee", debitLogs.getBigDecimal("rmb_amount"));
 
         sysLogs.put("surcharge", creditLogs.getBigDecimal("charge_amount").subtract(debitLogs.getBigDecimal("charge_amount")));
 
         sysLogs.put("sys_settle_amount", sysLogs.getBigDecimal("sys_pay_fee").subtract(sysLogs.getBigDecimal("sys_refund_fee")).subtract(sysLogs.getBigDecimal("surcharge")));
-        sysLogs.put("start_date","2018-02-05");
+        sysLogs.put("start_date","2018-04-05");
         sysLogs.put("end_date",sdfClear.format(new Date()));
         return sysLogs;
     }

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/java/au/com/royalpay/payment/manage/tradelog/refund/impls/RefundServiceImpl.java

@@ -221,7 +221,7 @@ public class RefundServiceImpl implements RefundService, ApplicationEventPublish
             operator.put("operator_id", partnerAccount.getString("account_id"));
             operator.put("operator", partnerAccount.getString("display_name"));
         } else {
-            operator.put("operator_id", manager.getIntValue("manager_id"));
+            operator.put("operator_id", manager.getString("manager_id"));
             operator.put("operator", manager.getString("display_name"));
         }
         boolean requireAudit = type == OperatorType.PARTNER && PartnerRole.getRole(partnerAccount.getIntValue("role")) == PartnerRole.CASHIER

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

src/main/ui/static/activity/encourage/templates/encourage_detail.html

@@ -9,7 +9,7 @@
     </section>
     <section class="content">
         <div class="box box-primary">
-            <div class="box-header">Parameters <a role="button" title="Edit" ng-click="modifyEvent()"><i class="fa fa-edit"></i></a></div>
+            <div class="box-header">Parameters <a role="button" ng-if="('1'|withRole)" title="Edit" ng-click="modifyEvent()"><i class="fa fa-edit"></i></a></div>
             <div class="box-body">
                 <div class="row">
                     <div class="col-xs-4 col-sm-3">From:{{event.parameters.from_date|limitTo:10}}</div>