Merge branch 'develop'

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

@@ -126,6 +126,8 @@ public interface RiskBusinessService {
      */
     JSONObject getRiskEventMaterialsRemark(String riskId);
 
+    void banRiskEvent(String riskId);
+
     JSONObject riskEventMaterialPass(JSONObject params, JSONObject manager);
 
     JSONObject updateIsSendClient(String riskId);

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

@@ -980,6 +980,14 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         return result;
     }
 
+    @Override
+    public void banRiskEvent(String riskId) {
+        JSONObject params = new JSONObject();
+        params.put("risk_id",riskId);
+        params.put("is_valid",0);
+        riskEventMapper.update(params);
+    }
+
     @Transactional
     @Override
     public JSONObject riskEventMaterialPass(JSONObject params, JSONObject manager) {

src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java

@@ -151,6 +151,11 @@ public class RiskBusinessController {
         riskBusinessService.sendUrgeEmail(risk_id);
     }
 
+    @RequestMapping(value = "/ban/{risk_id}",method = RequestMethod.DELETE)
+    public void banEvent(@PathVariable String risk_id){
+        riskBusinessService.banRiskEvent(risk_id);
+    }
+
     @GetMapping(value = "/partners")
     public List<JSONObject> getPartners(PartnerQuery partnerQuery) {
         JSONObject param = partnerQuery.toJsonParam();

src/main/resources/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskEventMapper.xml

@@ -51,6 +51,7 @@
             ON sc.client_id = scb.client_id
         </if>
         <where>
+            re.is_valid = 1
             <if test="risk_id != null">
                 AND re.risk_id = #{risk_id}
             </if>
@@ -175,6 +176,7 @@
             ON re.risk_id = ro.risk_id
         </if>
         <where>
+            re.is_valid = 1
             <if test="risk_id != null">
                 AND re.risk_id = #{risk_id}
             </if>
@@ -257,6 +259,7 @@
         ) ro
         ON re.risk_id = ro.risk_id
         <where>
+            re.is_valid = 1
             <if test="risk_id != null">
                 AND re.risk_id = #{risk_id}
             </if>

src/main/ui/static/analysis/risk_business.js

@@ -292,6 +292,20 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                     orderChannel = null;
                 }
 
+                $scope.deleteRiskEvent = function () {
+                    commonDialog.confirm({
+                        title: 'Delete This Risk Event',
+                        content: 'Are you sure to delete this risk event?'
+                    }).then(function () {
+                        $http.delete('/risk/business/ban/' + $scope.riskEvent.risk_id).then(function () {
+                            $state.go('analysis_monitoring.risk_business');
+                            commonDialog.alert({title: 'Delete', content: 'Risk Event Already Disabled', type: 'error'});
+                        }, function (resp) {
+                            commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
+                        })
+                    })
+                };
+
                 /**
                  * order_ids在指定位置换行
                  * @param str

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

@@ -9,6 +9,9 @@
                 <i class="fa fa-arrow-right" aria-hidden="true" style="margin-top: 5px" ng-if="riskEvent.process_logs.length > ($index + 1)"></i>
             </small>
         </div>
+        <div class="btn-group pull-right" role="group" aria-label="..." ng-if="'10000000000'|withRole">
+            <button type="button" class="btn btn-danger" ng-click="deleteRiskEvent()">Delete</button>
+        </div>
     </div>
     <div class="row">
         <div class="col-sm-12">