From af7885d67124a5bf4d81737135be62a4a0352c30 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 13 Aug 2019 17:18:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?add=20=E9=A3=8E=E6=8E=A7=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=94=B6=E5=88=B0=E9=A3=8E=E6=8E=A7=E6=9D=90=E6=96=99=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../core/RiskBusinessService.java | 2 ++ .../core/impl/RiskBusinessServiceImpl.java | 22 +++++++++++++++++++ .../web/RiskBusinessController.java | 5 +++++ src/main/ui/static/analysis/risk_business.js | 16 ++++++++++++++ .../analysis/templates/riskEvent_detail.html | 5 +++++ 6 files changed, 51 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 73e5cb385..4cf7d9a3b 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.1.12 + 1.1.13 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/RiskBusinessService.java b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/RiskBusinessService.java index fd1a97767..a1273d3d8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/RiskBusinessService.java +++ b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/RiskBusinessService.java @@ -135,6 +135,8 @@ public interface RiskBusinessService { void banRiskEvent(String riskId); + void commitWaitRiskStatus(String riskId, String codeKey, JSONObject manager); + JSONObject riskEventMaterialPass(JSONObject params, JSONObject manager); JSONObject updateIsSendClient(String riskId); 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 1b7a12766..1b613be35 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 @@ -18,6 +18,7 @@ import au.com.royalpay.payment.manage.pushMessage.bean.AppManagerMessageBuilder; import au.com.royalpay.payment.manage.riskbusiness.core.RiskBusinessService; import au.com.royalpay.payment.manage.riskbusiness.core.RiskMaterialService; import au.com.royalpay.payment.manage.riskbusiness.core.RiskProcessLogService; +import au.com.royalpay.payment.manage.riskbusiness.core.RiskUploadService; import au.com.royalpay.payment.manage.riskbusiness.enums.RiskEmailStatusEnum; import au.com.royalpay.payment.manage.riskbusiness.enums.RiskResultTypeEnum; import au.com.royalpay.payment.manage.signin.beans.TodoNotice; @@ -100,6 +101,8 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo @Resource private TradeLogService tradeLogService; @Resource + private RiskUploadService riskUploadService; + @Resource private RoyalThreadPoolExecutor royalThreadPoolExecutor; private final String UPLOAD_MAIL_PREFIX = "UPLOAD_MAIL"; @@ -1247,6 +1250,25 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo riskEventMapper.update(params); } + @Override + public void commitWaitRiskStatus(String riskId, String codeKey, JSONObject manager) { + JSONObject event = riskEventMapper.findById(riskId); + if (event.getIntValue("result_type") != RiskResultTypeEnum.SEND_EMAIL_TO_BD.getResultType() &&event.getIntValue("result_type") != RiskResultTypeEnum.MATERIAL_NOT_PASS.getResultType()) { + throw new BadRequestException("风控调单不存在或资料已补全"); + } + if(event.getIntValue("result_type")!= RiskResultTypeEnum.MATERIAL_AUDIT_PASS.getResultType()){ + event.put("result_type", RiskResultTypeEnum.WAIT_FOR_AUDIT.getResultType()); + riskEventMapper.update(event); + } + riskProcessLogService.addRiskProcessLog(riskId, + manager.getString("manager_id"), + manager.getString("display_name"), + RiskResultTypeEnum.WAIT_FOR_AUDIT.getRemark(), + RiskResultTypeEnum.SEND_EMAIL_TO_BD.getResultType(), + RiskResultTypeEnum.WAIT_FOR_AUDIT.getResultType()); + riskUploadService.deleteUploadMailKey(codeKey); + } + @Transactional @Override public JSONObject riskEventMaterialPass(JSONObject params, JSONObject manager) { diff --git a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java index 53839c21b..489dde36e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java +++ b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java @@ -170,6 +170,11 @@ public class RiskBusinessController { riskBusinessService.banRiskEvent(risk_id); } + @RequestMapping(value = "/commitWaitRiskStatus/{risk_id}/{codeKey}", method = RequestMethod.PUT) + public void commitWaitRiskStatus(@PathVariable String risk_id,@PathVariable String codeKey,@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { + riskBusinessService.commitWaitRiskStatus(risk_id, codeKey, manager); + } + @GetMapping(value = "/partners") public List getPartners(PartnerQuery partnerQuery) { JSONObject param = partnerQuery.toJsonParam(); diff --git a/src/main/ui/static/analysis/risk_business.js b/src/main/ui/static/analysis/risk_business.js index 60bb3991d..399129b1b 100644 --- a/src/main/ui/static/analysis/risk_business.js +++ b/src/main/ui/static/analysis/risk_business.js @@ -335,6 +335,22 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], }) }; + $scope.commitWaitRiskStatus = function () { + var codeKey = $scope.riskEvent.submit_url.substring($scope.riskEvent.submit_url.lastIndexOf('=') + 1) || $scope.riskEvent.submit_url.substring($scope.riskEvent.submit_url.lastIndexOf('/') + 1); + commonDialog.confirm({ + title: '确认已提交资料', + content: '确认已收到商户资料，更新风控状态为等待风控审核?' + }).then(function () { + $http.put('/risk/business/commitWaitRiskStatus/' + $scope.riskEvent.risk_id + '/' + codeKey).then(function () { + $state.go('analysis_monitoring.risk_business'); + commonDialog.alert({title: 'Success', content: '风控状态已修改为等待风控审核状态', type: 'success'}); + }, function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); + }); + + }) + }; + /** * order_ids在指定位置换行 * @param str diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail.html b/src/main/ui/static/analysis/templates/riskEvent_detail.html index a776bf199..72a762d17 100644 --- a/src/main/ui/static/analysis/templates/riskEvent_detail.html +++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html @@ -23,6 +23,11 @@
  • Audit material
    • +
  • +
    + +
    +
    • From 9fddf8e0f90ff6934192b898a1b098bc8ec80832 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 13 Aug 2019 17:46:53 +0800 Subject: [PATCH 2/4] fix pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4cf7d9a3b..6dec3b041 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.1.13 + 1.1.14 UTF-8 From cf7e8cbcaa6ece39bed6758d1003e8b26cf95a59 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 13 Aug 2019 18:38:14 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix=20=E9=A3=8E=E6=8E=A7=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../riskbusiness/core/impl/RiskBusinessServiceImpl.java | 7 ++++++- src/main/ui/static/analysis/risk_business.js | 5 ++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6dec3b041..52dd127ca 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.1.14 + 1.1.15 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 1b613be35..1697bf419 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 @@ -685,7 +685,12 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo riskMaterialService.updateRiskMaterial(riskId, refuseDescription); Context ctx = getMailContext(event); ctx.setVariable("refuse",true); - ctx.setVariable("refuse_description", riskMaterialMapper.findAllMaterials(riskId).get(0).getString("refuse_description")); + List findAllMaterials = riskMaterialMapper.findAllMaterials(riskId); + if (findAllMaterials == null || findAllMaterials.size() == 0) { + ctx.setVariable("refuse_description", ""); + }else { + ctx.setVariable("refuse_description", findAllMaterials.get(0).getString("refuse_description")); + } final List emailsTos = (List)ctx.getVariable("emailsTos"); final List emailsCcs = ctx.getVariable("emailsCcs")==null?new ArrayList<>():(List)ctx.getVariable("emailsCcs"); final String uploadUrl = (String)ctx.getVariable("uploadUrl"); diff --git a/src/main/ui/static/analysis/risk_business.js b/src/main/ui/static/analysis/risk_business.js index 399129b1b..af3a2fca3 100644 --- a/src/main/ui/static/analysis/risk_business.js +++ b/src/main/ui/static/analysis/risk_business.js @@ -336,7 +336,10 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], }; $scope.commitWaitRiskStatus = function () { - var codeKey = $scope.riskEvent.submit_url.substring($scope.riskEvent.submit_url.lastIndexOf('=') + 1) || $scope.riskEvent.submit_url.substring($scope.riskEvent.submit_url.lastIndexOf('/') + 1); + var index = $scope.riskEvent.submit_url.lastIndexOf('='); + if (index < 0) + index = $scope.riskEvent.submit_url.lastIndexOf('/'); + var codeKey = $scope.riskEvent.submit_url.substring(index + 1); commonDialog.confirm({ title: '确认已提交资料', content: '确认已收到商户资料，更新风控状态为等待风控审核?' From a408b55326f1f38030f2cf56e47ba100cbb5c1cc Mon Sep 17 00:00:00 2001 From: todking Date: Wed, 14 Aug 2019 15:03:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix=20=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=89=8D=E7=AB=AF=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/payment/partner/partner-manage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 047ac71dc..8eb6f29a2 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -3739,7 +3739,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.uploadAgreementFile = function (file) { if (file != null) { if (file.size > 10 * 1024 * 1024) { - commonDialog.alert({title: 'Error', content: '文件大小不能超过5MB，请压缩后重试', type: 'error'}) + commonDialog.alert({title: 'Error', content: '文件大小不能超过10MB，请压缩后重试', type: 'error'}) } else { $scope.agreementFileProgress = {value: 0}; Upload.upload({