Merge branch 'bugfix' into develop

src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java

@@ -7,7 +7,6 @@ import au.com.royalpay.payment.manage.merchants.core.ClientManager;
 import au.com.royalpay.payment.manage.system.core.ClientContractService;
 import au.com.royalpay.payment.tools.env.SysConfigManager;
 import au.com.royalpay.payment.tools.exceptions.NotFoundException;
-import au.com.royalpay.payment.tools.exceptions.ServerErrorException;
 import au.com.royalpay.payment.tools.utils.PageListUtils;
 
 import com.alibaba.fastjson.JSONObject;
@@ -50,8 +49,8 @@ public class ClientContractServiceImpl implements ClientContractService {
         try {
             clientManager.getNewAggregateAgreeFile(client.getString("client_moniker"), null, true);
         } catch (Exception e) {
-            logger.info("App generate PDF failed");
-            throw new ServerErrorException("System error");
+//            logger.info("App generate PDF failed");
+//            throw new ServerErrorException("System error");
         }
         List<JSONObject> files = clientFilesMapper.findFileByClientAndType(client_id, "source_agree_file");
         return files.get(0);

src/main/resources/application-wechat.properties

@@ -17,4 +17,4 @@ app.wechatpay.merchants.1487387142.mp-id=globalpay
 app.wechatpay.merchants.1487387142.merchant-id=1487387142
 app.wechatpay.merchants.1487387142.mch-key=OuvLIL93STqFhTngNaBGT8751ZJn4FKL
 app.wechatpay.merchants.1487387142.key-file=classpath:napclient_cert.p12
-app.wechatpay.merchants.1487387142.example-sub-merchant-id=117551742
+app.wechatpay.merchants.1487387142.example-sub-merchant-id=203312199

src/main/ui/static/config/devtools/templates/wx_settlements.html

@@ -24,9 +24,9 @@
                 <div class="form-group">
                     <label class="control-label">Merchant ID</label>
                     <select ng-model="params.merchant" id="merchant-select" class="form-control">
-                        <option value="1307485301">1307485301</option>
-                        <option value="1431999902">1431999902</option>
-                        <option value="1487387142">1487387142</option>
+                        <option value="1307485301">1307485301(Tunnel Show 1)</option>
+                        <option value="1431999902">1431999902(Tunnel Show 2)</option>
+                        <option value="1487387142">1487387142(NAP)</option>
                     </select>
                 </div>
                 <button class="btn btn-primary" ng-click="loadSettlements()">