diff --git a/pom.xml b/pom.xml index b56a3a2be..254f91e9c 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.2.3 + 1.2.4 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java index 19b29415f..9b083e99a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java @@ -792,7 +792,7 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo ctx.setVariable("order_type", event.getIntValue("order_type")); ctx.setVariable("bdNamesStr", bdNamesStr); ctx.setVariable("reply_date", reply_date); - ctx.setVariable("is_resend",new Date().compareTo(event.getDate("reply_email_date")) < 0); + ctx.setVariable("is_resend",new Date().compareTo(event.getDate("reply_email_date"))); ctx.setVariable("reply_date_english", reply_date_english); ctx.setVariable("client", client); ctx.setVariable("uploadUrl", uploadUrl); diff --git a/src/main/resources/templates/mail/risk_urge_mail.html b/src/main/resources/templates/mail/risk_urge_mail.html index f20084d1d..25ff3931d 100644 --- a/src/main/resources/templates/mail/risk_urge_mail.html +++ b/src/main/resources/templates/mail/risk_urge_mail.html @@ -1,12 +1,12 @@ Dear RoyalPay Merchant/BD :

您好，您的风控材料— 【】 - 已逾期 - 提交期限即将于到期 + 已逾期 + 提交期限即将于到期 ，请及时提交风控材料。未能按时提交完整证明材料，支付渠道将被关停，请您务必配合调查。感谢。

Your deadline for submission of risk materials for 【】 - has expired - is about to expire by + has expired + is about to expire by , please submit the risk materials in time.If you can not provide qualified materials on time, the payment channels would be suspended or restricted with amount limit. Please be sure to assist the investigation. Thanks.

Best Regards

diff --git a/src/main/ui/static/analysis/risk_business.js b/src/main/ui/static/analysis/risk_business.js index 34e7532e2..c4dcfe1f2 100644 --- a/src/main/ui/static/analysis/risk_business.js +++ b/src/main/ui/static/analysis/risk_business.js @@ -777,11 +777,9 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], $scope.is_send_client = false; $scope.changeIsSendClient = function(flag) { $scope.is_send_client = flag - }; - $scope.send_clean_days = false; - $scope.changeIsSendClient = function (flag) { $scope.send_clean_days = flag }; + $scope.send_clean_days = false; $scope.save = function (form) { if (form.$invalid) { angular.forEach(form, function (item, key) { @@ -813,6 +811,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], var saveRiskBtn = document.getElementById('save-risk-btn'); var saveRiskBtnInnerHtmlBak = saveRiskBtn.innerHTML; saveRiskBtn.disabled = true; + debugger saveRiskBtn.innerHTML = " Processing"; $http.post('/risk/business/events', $scope.riskEvent).then(function (resp) { saveRiskBtn.innerHTML = saveRiskBtnInnerHtmlBak;