From aceb124d3dd91c21845f8003a058d37f73af14c0 Mon Sep 17 00:00:00 2001 From: duLingLing Date: Tue, 3 Sep 2019 14:03:00 +0800 Subject: [PATCH 1/6] =?UTF-8?q?Upd:=E4=BC=98=E5=8C=96=E9=A3=8E=E6=8E=A7?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/impl/RiskBusinessServiceImpl.java | 1 + .../resources/templates/mail/risk_urge_mail.html | 12 +++++++++--- .../static/analysis/templates/riskEvent_detail.html | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) 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 912a76170..19b29415f 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,6 +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("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 482cb7858..f20084d1d 100644 --- a/src/main/resources/templates/mail/risk_urge_mail.html +++ b/src/main/resources/templates/mail/risk_urge_mail.html @@ -1,7 +1,13 @@ Dear RoyalPay Merchant/BD : -

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

-

Your deadline for submission of risk materials for 【】 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.

+

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

+

Your deadline for submission of risk materials for 【】 + 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

Email:
info@royalpay.com.au
- Tel:
+ Tel:
与调查交易金额对应的购物小票/发票存根照片 要求：照片应清晰 1300 10 77 50

Service WeChat Account:
diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail.html b/src/main/ui/static/analysis/templates/riskEvent_detail.html index 72a762d17..a8c71a30d 100644 --- a/src/main/ui/static/analysis/templates/riskEvent_detail.html +++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html @@ -367,6 +367,7 @@ +

共计{{tradeLogs.length}}条

@@ -383,7 +384,7 @@ 返回 From 2f07701a272541f2c7551e58ed7996ee0e1f3af3 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 3 Sep 2019 18:00:04 +0800 Subject: [PATCH 2/6] add put --- pom.xml | 2 +- .../au/com/royalpay/payment/manage/dev/web/TestController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e8638d386..9b00b9c2a 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.2.0 + 1.2.1 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java index 91513995b..bb587f712 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java @@ -275,7 +275,7 @@ public class TestController implements ApplicationEventPublisherAware { return list.isEmpty() ? new JSONObject() : list.get(0); } - @ManagerMapping(value = "/fix_transaction/{orderId}", method = RequestMethod.PUT, role = ManagerRole.DEVELOPER) + @ManagerMapping(value = "/fix_transaction/{orderId}", method = RequestMethod.GET, role = ManagerRole.DEVELOPER) public void fixTransactionsByOrderId(@PathVariable String orderId) { JSONObject order = orderMapper.find(orderId); try { From c01428bc1f045323ab04b1649895c7243c42bc50 Mon Sep 17 00:00:00 2001 From: duLingLing Date: Tue, 3 Sep 2019 19:16:46 +0800 Subject: [PATCH 3/6] =?UTF-8?q?UPD:=E9=A3=8E=E6=8E=A7=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/manage.html | 2 +- src/main/ui/static/analysis/risk_business.js | 14 +++++++------- .../analysis/templates/riskEvent_detail.html | 6 +++--- .../static/analysis/templates/risk_business.html | 4 ++-- .../analysis/templates/risk_business_bd.html | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html index 97aaaeb7a..7d24f0daa 100644 --- a/src/main/ui/manage.html +++ b/src/main/ui/manage.html @@ -451,7 +451,7 @@ margin-bottom: 10%;"/>

  • - + 风控业务|Risk Business
    • diff --git a/src/main/ui/static/analysis/risk_business.js b/src/main/ui/static/analysis/risk_business.js index af3a2fca3..6dc31d671 100644 --- a/src/main/ui/static/analysis/risk_business.js +++ b/src/main/ui/static/analysis/risk_business.js @@ -107,7 +107,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], templateUrl: '/static/analysis/templates/risk_business_bd.html', cache: false, controller: 'riskBusinessCtrl' - }).state('analysis_monitoring.riskEvent_detail', { + }).state('analysis_monitoring.risk_business.riskEvent_detail', { url: '/{risk_id}/detail', templateUrl: '/static/analysis/templates/riskEvent_detail.html', controller: 'riskEventDetailCtrl', @@ -116,7 +116,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], return $http.get('/risk/business/events/' + $stateParams.risk_id); }] } - }).state('analysis_monitoring.riskEvent_detail_bd', { + }).state('analysis_monitoring.risk_business.riskEvent_detail_bd', { url: '/{risk_id}/bd/detail', templateUrl: '/static/analysis/templates/riskEvent_detail_bd.html', controller: 'riskEventDetailCtrl', @@ -125,11 +125,11 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], return $http.get('/risk/business/events/' + $stateParams.risk_id); }] } - }).state('analysis_monitoring.risk_business.new_riskEvent', { + }).state('analysis_monitoring.risk_business.risk_business.new_riskEvent', { url: '/new_riskEvent', templateUrl: '/static/analysis/templates/new_riskEvent.html', controller: 'newRiskEventCtrl' - }).state('analysis_monitoring.riskEvent_detail.audit_material', { + }).state('analysis_monitoring.risk_business.riskEvent_detail.audit_material', { url: '/audit_material', templateUrl: '/static/analysis/templates/audit_material.html', controller: 'auditMaterialCtrl' @@ -423,7 +423,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], content: 'Update riskEvent successfully', type: 'success' }); - $state.reload('analysis_monitoring.riskEvent_detail'); + $state.reload('analysis_monitoring.risk_business.riskEvent_detail'); }, function (resp) { commonDialog.alert({ title: 'Error', @@ -451,7 +451,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], content: 'Are you sure?' }).then(function () { $http.put('/risk/business/channel/' + channel + '/permission/' + channelFlag, $scope.riskEvent).then(function () { - $state.reload('analysis_monitoring.riskEvent_detail'); + $state.reload('analysis_monitoring.risk_business.riskEvent_detail'); }, function (resp) { commonDialog.alert({ title: 'Failed to change ' + channel + ' channel permission status', @@ -470,7 +470,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], content: 'Are you sure?' }).then(function () { $http.put('/risk/business/partner/' + isValid, $scope.riskEvent).then(function () { - $state.reload('analysis_monitoring.riskEvent_detail'); + $state.reload('analysis_monitoring.risk_business.riskEvent_detail'); }, function (resp) { commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); }) diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail.html b/src/main/ui/static/analysis/templates/riskEvent_detail.html index a8c71a30d..d9fac8c42 100644 --- a/src/main/ui/static/analysis/templates/riskEvent_detail.html +++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html @@ -18,10 +18,10 @@
    @@ -451,7 +451,7 @@ margin-bottom: 10%;"/>

    • - + 风控业务|Risk Business
      • @@ -664,11 +664,11 @@ margin-bottom: 10%;"/> - + - + - - - + + + - - - + + +

    • diff --git a/src/main/ui/static/analysis/risk_business.js b/src/main/ui/static/analysis/risk_business.js index 6dc31d671..34e7532e2 100644 --- a/src/main/ui/static/analysis/risk_business.js +++ b/src/main/ui/static/analysis/risk_business.js @@ -116,7 +116,11 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], return $http.get('/risk/business/events/' + $stateParams.risk_id); }] } - }).state('analysis_monitoring.risk_business.riskEvent_detail_bd', { + }).state('analysis_monitoring.risk_business.riskEvent_detail.audit_material', { + url: '/audit_material', + templateUrl: '/static/analysis/templates/audit_material.html', + controller: 'auditMaterialCtrl' + }).state('analysis_monitoring.riskEvent_detail_bd', { url: '/{risk_id}/bd/detail', templateUrl: '/static/analysis/templates/riskEvent_detail_bd.html', controller: 'riskEventDetailCtrl', @@ -125,14 +129,10 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], return $http.get('/risk/business/events/' + $stateParams.risk_id); }] } - }).state('analysis_monitoring.risk_business.risk_business.new_riskEvent', { + }).state('analysis_monitoring.risk_business.new_riskEvent', { url: '/new_riskEvent', templateUrl: '/static/analysis/templates/new_riskEvent.html', controller: 'newRiskEventCtrl' - }).state('analysis_monitoring.risk_business.riskEvent_detail.audit_material', { - url: '/audit_material', - templateUrl: '/static/analysis/templates/audit_material.html', - controller: 'auditMaterialCtrl' }); }]); @@ -153,6 +153,10 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], industries.push(industry.label); }); industries.push('未知行业'); + $scope.$watch('params',function (newVal) { + console.log('params changed--->',newVal) + }); + console.log('riskBusinessCtrl loaded') // console.log(industries); // 加载风险注册事件 $scope.loadRiskEvents = function (page) { @@ -738,20 +742,20 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], $scope.increase = function ($index) { $scope.materials.splice($index + 1, 0, - {key: new Date().getTime(), value: ""}); // 用时间戳作为每个item的key - // 增加新的input后允许删除 + {key: new Date().getTime(), value: ""}); // 用时间戳作为每个item的key + // 增加新的input后允许删除 $scope.canMinus = true; }; $scope.decrease = function($index) { // 如果input大于1，删除 - if ($scope.materials.length > 1) { - $scope.materials.splice($index, 1); - } - // 如果回复数为1，不允许删除 - if ($scope.materials.length == 1) { - $scope.canMinus = false; - } + if ($scope.materials.length > 1) { + $scope.materials.splice($index, 1); + } + // 如果回复数为1，不允许删除 + if ($scope.materials.length == 1) { + $scope.canMinus = false; + } }; var array=new Array(); var validIndex = 0; diff --git a/src/main/ui/static/analysis/templates/audit_material.html b/src/main/ui/static/analysis/templates/audit_material.html index 2215d25dd..f070b8f28 100644 --- a/src/main/ui/static/analysis/templates/audit_material.html +++ b/src/main/ui/static/analysis/templates/audit_material.html @@ -83,8 +83,8 @@

      - 返回 diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail.html b/src/main/ui/static/analysis/templates/riskEvent_detail.html index d9fac8c42..56cc960e9 100644 --- a/src/main/ui/static/analysis/templates/riskEvent_detail.html +++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html @@ -21,7 +21,7 @@ Risk Detail
    • - Audit material + Audit material
    • @@ -40,7 +40,7 @@ + ng-if="('10000000000'|withRole)"> Edit
      @@ -465,11 +465,11 @@
      @@ -608,17 +608,17 @@