[fix]风控接口修改

src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java

@@ -16,6 +16,7 @@ import au.com.royalpay.payment.manage.merchants.beans.ClientUpdateInfo;
 import au.com.royalpay.payment.manage.riskbusiness.bean.RiskEventQuery;
 import au.com.royalpay.payment.manage.riskbusiness.core.RiskBusinessService;
 import au.com.royalpay.payment.manage.riskbusiness.core.RiskUploadService;
+import au.com.royalpay.payment.manage.riskbusiness.enums.RiskResultTypeEnum;
 import au.com.royalpay.payment.manage.settlement.core.ManualSettleSupport;
 import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean;
 import au.com.royalpay.payment.manage.signin.core.SignInStatusManager;
@@ -44,6 +45,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -592,9 +594,17 @@ public class RetailAppController {
      */
     @GetMapping(value = "/risk/business/events")
     public JSONObject getRiskEvents(RiskEventQuery riskEventQuery) {
-        JSONObject param = riskEventQuery.toJSON();
-        param.put("client_moniker", riskEventQuery.getClientMoniker());
-        return riskBusinessService.getRiskEventsByPage(param, null);
+        JSONObject params = riskEventQuery.toJSON();
+        params.put("client_moniker", riskEventQuery.getClientMoniker());
+        params.put("is_send_client", 1);
+        params.putIfAbsent("page", 1);
+        List<Integer> resultTypes = Arrays.asList(RiskResultTypeEnum.SEND_EMAIL_TO_BD.getResultType(),
+                RiskResultTypeEnum.WAIT_FOR_AUDIT.getResultType(),
+                RiskResultTypeEnum.MATERIAL_AUDIT_PASS.getResultType(),
+                RiskResultTypeEnum.MATERIAL_NOT_PASS.getResultType(),
+                RiskResultTypeEnum.ALREADY_HANDLED.getResultType());
+        params.put("result_types", resultTypes);
+        return riskBusinessService.getRiskEventsByPage(params, null);
     }
 
     /**

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

@@ -40,6 +40,7 @@ public class RiskUploadServiceIpml implements RiskUploadService {
     @Override
     public void submitMaterial(JSONObject material) {
         JSONObject event = riskEventMapper.findById(material.getString("risk_id"));
+        material.putIfAbsent("update_time", DateFormatUtils.format(new Date(), "yyyy-MM-dd hh:mm:ss"));
         riskMaterialMapper.save(material);
         material.put("material_id",riskMaterialMapper.findAllMaterials(material.getString("risk_id")).get(0).getString("material_id"));
         for(int i=1;i<=10;i++){