Merge branch 'develop'

# Conflicts:
#	pom.xml
#	src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
#	src/main/ui/static/payment/partner/partner.js

pom.xml

@@ -5,15 +5,17 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>0.2.0</version>
+        <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
+    <version>1.0.19</version>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.1.2</jib-maven-plugin.version>
-        <docker-image.version>1.1.18</docker-image.version>
+        <docker-image.version>${project.version}</docker-image.version>
     </properties>
 
     <dependencies>

src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java

@@ -67,6 +67,8 @@ import java.net.URISyntaxException;
 import java.util.Date;
 import java.util.List;
 
+import static au.com.royalpay.payment.manage.permission.utils.OrgCheckUtils.checkOrgPermission;
+
 /**
  * Created by yixian on 2016-07-06.
  */

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -4859,7 +4859,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             needCheckParams.put("bank_account_no", bankAccount.getString("account_no"));
         }
         List<JSONObject> listRiskySimilarMerchants = riskAttentionMerchantsMapper.listRiskySimilarMerchants(needCheckParams);
-        if (listRiskySimilarMerchants.size() > 0) {
+        if (!listRiskySimilarMerchants.isEmpty()) {
             StringBuilder appendStr = new StringBuilder();
             StringBuilder infoStr = new StringBuilder();
 

src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml

@@ -689,8 +689,8 @@
         COUNT(DISTINCT o.customer_id) AS customers,
         o.channel AS channel,
         ifnull(SUM(if(t.transaction_type = 'Credit', t.clearing_amount, 0)), 0)  AS total,
-        ifnull(SUM(if(t.refund_id>0, t.clearing_amount, 0)), 0)  AS refund_amount,
+        ifnull(SUM(if(t.transaction_type = 'Debit', t.clearing_amount, 0)), 0)  AS refund_amount,
-        SUM(if(t.refund_id>0, 1, 0)) AS refund_orders,
+        SUM(if(t.transaction_type = 'Debit', 1, 0)) AS refund_orders,
         round(SUM(if(t.transaction_type='Credit',t.clearing_amount,0))/COUNT(DISTINCT o.customer_id),2) single_amount
         FROM pmt_transactions t
         INNER JOIN pmt_orders o ON o.order_id = t.order_id

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

@@ -659,7 +659,7 @@
                                WHERE scr.rate_name = 'CB_BankPay'
                                  AND (scr.expiry_time IS NULL
                                    OR scr.expiry_time >= NOW()))
-          AND cb_bankpay_url IS NULL;
+          AND cb_bankpay_url IS NULL
 
     </select>
 </mapper>

src/main/resources/templates/mail/risk_upload_mail.html

@@ -146,6 +146,9 @@
     <p>我司风控系统检测到您短期内后台交易存在异常行为（<span th:if="${warning_order_type==0}" style="background: #FCE824">单人多次大金额交易</span><span th:if="${warning_order_type==1}" style="background: #FCE824">退款频繁</span>），触发平台风控预警，特此提醒：请勿使用平台进行违规交易，一经核查将关闭支付权限。请知悉。<br>
         RoyalPay's risk management system has identified abnormal transactions from your records in a short time(<span th:if="${warning_order_type==0}" style="background: #FCE824">Single person pays large sums several times</span><span th:if="${warning_order_type==1}" style="background: #FCE824">frequent refund transactions</span>),which triggered the platform risk control warning. Here reminds: Do not use the platform for illegal transactions. Once verified, the payment authority will be closed. </p>
 </div>
+<br>
+<a href="https://royalpay-1256684202.cos.ap-chengdu.myqcloud.com/%E9%A3%8E%E6%8E%A7%E6%8C%87%E5%BC%95-%E5%95%86%E6%88%B7.pdf">
+    <p>了解更多关于我司风控事宜。Click into the link to see more about our risk management work.</p></a>
 <p>顺颂商祺<br>
     Sincerely
 </p>

src/main/ui/static/payment/partner/partner.js

@@ -390,6 +390,9 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload','uiBoot
         };
 
         $scope.toggleClientPayType = function (type) {
+            if (!$scope.partner.client_pay_type) {
+                $scope.partner.client_pay_type = [];
+            }
             var $idx = $scope.partner.client_pay_type.indexOf(type);
             if ($idx >= 0) {
                 $scope.partner.client_pay_type.splice($idx, 1);
@@ -410,6 +413,9 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload','uiBoot
         };
 
         $scope.toggleClientPayDesc = function (type) {
+            if (!$scope.partner.client_pay_desc) {
+                $scope.partner.client_pay_desc = [];
+            }
             var $idx = $scope.partner.client_pay_desc.indexOf(type);
             if ($idx >= 0) {
                 if (type == '203') {