风控增加是否发送清算周期变更选项

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
  * 用于商户提交海关需要的订单附件信息。仅支持微信和支付宝，微信只支持一个月内的支付订单进行报关申请。

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 = {};

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

@@ -79,8 +79,8 @@
     <p th:if="${refuse_description != null}">
         拒绝理由：<span th:text="${refuse_description}" style="background-color: yellow"></span>。
     </p>
-    <p>近期由于我们的风控系统检测到您的交易异常<span th:if="${royalpay_order_type==1}">，已暂时将您的清算周期调整为T+<span th:text="${client.clean_days}"></span></span>，还请您提供以下材料，还原附件中列明的交易的真实背景：<br>
+    <p>近期由于我们的风控系统检测到您的交易异常<span th:if="${royalpay_order_type==1 and send_clean_days==1}">，已暂时将您的清算周期调整为T+<span th:text="${client.clean_days}"></span></span>，还请您提供以下材料，还原附件中列明的交易的真实背景：<br>
-        RoyalPay's risk management system recently has identified abnormal transactions from your records<span th:if="${royalpay_order_type==1}">, clean days has been adjusted to T+<span th:text="${client.clean_days}"></span></span>.so please provide us with following materials to assist in verifying the real scenario of the transactions attached:</p>
+        RoyalPay's risk management system recently has identified abnormal transactions from your records<span th:if="${royalpay_order_type==1 and send_clean_days==1}">, clean days has been adjusted to T+<span th:text="${client.clean_days}"></span></span>.so please provide us with following materials to assist in verifying the real scenario of the transactions attached:</p>
     <p>1.请解释相应的消费场景/业务模式，例如网站商城，扫码支付， 消费者到店支付等；<br>
         &nbsp;&nbsp;Please explain the relative payment scenario/business activities, for example, online store, QR code payment, payment at the store, etc;</p>
     <p>2.提供相应购物清单，订单小票（请提供与被查交易订单号相匹配的交易时间及金额的发票）；<br> 

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;

src/main/ui/static/analysis/templates/new_riskEvent.html

@@ -1,3 +1,4 @@
+
 <section class="content-header">
     <h1>New RiskEvent</h1>
 </section>
@@ -55,6 +56,15 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="form-group" ng-if="riskEvent.order_type ==3 && riskEvent.royalpay_order_type==1">
+                                <label class="control-label col-sm-2">是否发送清算周期变更</label>
+                                <div class="col-xs-6">
+                                    <input type="checkbox"
+                                           ng-model="send_clean_days"
+                                           ng-change="changeSendCleanDays(send_clean_days)"
+                                           bs-switch>
+                                </div>
+                            </div>
                             <div class="form-group"
                                  ng-if="riskEvent.order_type == 4"
                                  ng-class="{'has-error':riskEventForm.warning_order_type.$invalid && riskEventForm.warning_order_type.$dirty}">

src/main/ui/static/analysis/templates/riskEvent_detail.html

@@ -175,6 +175,16 @@
                                                     </div>
                                                 </div>
 
+                                                <div class="form-group" ng-if="riskEvent.order_type ==3 && riskEvent.royalpay_order_type==1">
+                                                    <label class="control-label col-sm-2">是否发送清算周期变更</label>
+                                                    <div class="col-xs-6">
+                                                        <input type="checkbox"
+                                                               bs-switch
+                                                               switch-readonly="true"
+                                                               ng-model="riskEvent.send_clean_days">
+                                                    </div>
+                                                </div>
+
                                                 <div ng-if="clientInfo != null">
                                                     <div class="form-group" ng-if="riskEvent.result_type <= 2">
                                                         <label class="control-label col-sm-2">Operaction</label>
@@ -569,6 +579,15 @@
                                                 </div>
                                             </div>
 
+                                            <div class="form-group" ng-if="riskEvent.order_type ==3 && riskEvent.royalpay_order_type==1">
+                                                <label class="control-label col-sm-2">是否发送清算周期变更</label>
+                                                <div class="col-xs-6">
+                                                    <input type="checkbox"
+                                                           bs-switch
+                                                           ng-model="riskEventEdit.send_clean_days">
+                                                </div>
+                                            </div>
+
                                             <div class="form-group">
                                                 <label class="control-label col-sm-2"
                                                        for="channel-result-input">Channel Handle Result