diff --git a/src/document/cn/apis.js b/src/document/cn/apis.js index ff0a01a93..5fbbf7c6e 100644 --- a/src/document/cn/apis.js +++ b/src/document/cn/apis.js @@ -878,7 +878,7 @@ * */ /** - * @api {PUT} /api/v1.0/customs/partners/{partner_code}/declare/query/{client_report_id} 创建报关单 + * @api {PUT} /api/v1.0/customs/partners/{partner_code}/declare/report/{client_report_id} 创建报关单 * @apiName declare_report * @apiDescription * 用于商户提交海关需要的订单附件信息。仅支持微信和支付宝，微信只支持一个月内的支付订单进行报关申请。 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 49aae675f..afa0681c9 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 @@ -787,6 +787,7 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo ctx.setVariable("warning_order_type", event.getIntValue("warning_order_type")); ctx.setVariable("description", event.getString("description")); ctx.setVariable("is_send_client",event.getIntValue("is_send_client")); + ctx.setVariable("send_clean_days",event.getIntValue("send_clean_days")); ctx.setVariable("mail_template",event.get("mail_template")==null?0:event.getIntValue("mail_template")); String realOrderIdsStr = event.getString("real_order_ids"); String[] realOrderIds = {}; diff --git a/src/main/resources/templates/mail/risk_upload_mail.html b/src/main/resources/templates/mail/risk_upload_mail.html index 9fb8b01fa..7fb29931e 100644 --- a/src/main/resources/templates/mail/risk_upload_mail.html +++ b/src/main/resources/templates/mail/risk_upload_mail.html @@ -79,8 +79,8 @@

拒绝理由：。

-

近期由于我们的风控系统检测到您的交易异常，已暂时将您的清算周期调整为T+，还请您提供以下材料，还原附件中列明的交易的真实背景：
- RoyalPay's risk management system recently has identified abnormal transactions from your records, clean days has been adjusted to T+.so please provide us with following materials to assist in verifying the real scenario of the transactions attached:

+

近期由于我们的风控系统检测到您的交易异常，已暂时将您的清算周期调整为T+，还请您提供以下材料，还原附件中列明的交易的真实背景：
+ RoyalPay's risk management system recently has identified abnormal transactions from your records, clean days has been adjusted to T+.so please provide us with following materials to assist in verifying the real scenario of the transactions attached:

1.请解释相应的消费场景/业务模式，例如网站商城，扫码支付， 消费者到店支付等；
  Please explain the relative payment scenario/business activities, for example, online store, QR code payment, payment at the store, etc;

2.提供相应购物清单，订单小票（请提供与被查交易订单号相匹配的交易时间及金额的发票）；
  diff --git a/src/main/ui/static/analysis/risk_business.js b/src/main/ui/static/analysis/risk_business.js index 8e3c51f49..b00d75ed3 100644 --- a/src/main/ui/static/analysis/risk_business.js +++ b/src/main/ui/static/analysis/risk_business.js @@ -282,6 +282,8 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], $scope.channelResults = channelResultArray; if (riskEvent.data.is_send_client == 1) riskEvent.data.is_send_client = true; + if (riskEvent.data.send_clean_days == 1) + riskEvent.data.send_clean_days = true; $scope.riskEvent = riskEvent.data; $scope.checkTemplate = function () { @@ -759,6 +761,10 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], $scope.changeIsSendClient = function (flag) { $scope.is_send_client = flag }; + $scope.send_clean_days = false; + $scope.changeIsSendClient = function (flag) { + $scope.send_clean_days = flag + }; $scope.save = function (form) { if (form.$invalid) { angular.forEach(form, function (item, key) { @@ -785,6 +791,8 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], $scope.riskEvent.is_send_client = $scope.is_send_client; + $scope.riskEvent.send_clean_days = $scope.send_clean_days; + var saveRiskBtn = document.getElementById('save-risk-btn'); var saveRiskBtnInnerHtmlBak = saveRiskBtn.innerHTML; saveRiskBtn.disabled = true; diff --git a/src/main/ui/static/analysis/templates/new_riskEvent.html b/src/main/ui/static/analysis/templates/new_riskEvent.html index f0a64110f..629c2ed5c 100644 --- a/src/main/ui/static/analysis/templates/new_riskEvent.html +++ b/src/main/ui/static/analysis/templates/new_riskEvent.html @@ -1,3 +1,4 @@ +

New RiskEvent

@@ -55,6 +56,15 @@ +
+ +
+ +
+
diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail.html b/src/main/ui/static/analysis/templates/riskEvent_detail.html index b87da2879..7dfd94f46 100644 --- a/src/main/ui/static/analysis/templates/riskEvent_detail.html +++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html @@ -175,6 +175,16 @@
+
+ +
+ +
+
+
@@ -569,6 +579,15 @@
+
+ +
+ +
+
+