Merge remote-tracking branch 'origin/develop'

src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java

@@ -1234,7 +1234,8 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
     @Override
     public JSONObject riskEventMaterialPass(JSONObject params, JSONObject manager) {
         Integer resultType = params.getInteger("result_type");
-        if (!resultType.equals(RiskResultTypeEnum.WAIT_FOR_AUDIT.getResultType())) {
+        //有些商户会直接回复邮件，未通过平台渠道
+        if (!resultType.equals(RiskResultTypeEnum.WAIT_FOR_AUDIT.getResultType()) && !resultType.equals(RiskResultTypeEnum.SEND_EMAIL_TO_BD.getResultType())) {
             throw new BadRequestException("Can't Pass");
         }
         params.put("result_type", RiskResultTypeEnum.MATERIAL_AUDIT_PASS.getResultType());

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

@@ -15,7 +15,7 @@
             <i class="fa fa-cloud-download">一键下载</i>
         </a>
         <a class="btn-group btn btn-success pull-right"
-           ng-if="riskEvent.result_type == 2"
+           ng-if="riskEvent.result_type == 2 || riskEvent.result_type == 1"
            ng-click="auditMaterial(3)">通过
         </a>
         <a class="btn-group btn btn-warning pull-right"