风控模块

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

@@ -9,18 +9,11 @@ import au.com.royalpay.payment.manage.riskbusiness.enums.RiskResultTypeEnum;
 import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
 import com.alibaba.fastjson.JSONObject;
-import com.sun.org.apache.xerces.internal.impl.dv.xs.BooleanDV;
-import com.sun.org.apache.xpath.internal.operations.Bool;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -56,6 +49,8 @@ public class RiskBusinessController {
     @PostMapping(value = "events")
     public void RegisterRiskEvent(@RequestBody JSONObject params,
                                   @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
+        params.put("fillin_id", manager.getString("manager_id"));
+        params.put("fillin_person", manager.getString("display_name"));
         riskBusinessService.addRiskEvent(params, manager);
     }
 
@@ -128,5 +123,21 @@ public class RiskBusinessController {
         JSONObject param = partnerQuery.toJsonParam();
         return clientManager.getClientBySimpleQuery(param);
     }
+
+    // 更新库中的orderIds
+    @GetMapping(value = "/complete/real_order_id")
+    public void completeEventRealOrderIds() {
+        riskBusinessService.completeEventRealOrderIds();
+    }
+
+    @GetMapping(value = "/delete/event")
+    public void deleteRiskEvent(@RequestParam("risk_id") String riskId) {
+        riskBusinessService.deleteRiskEvent(riskId);
+    }
+
+    @GetMapping(value = "/update/event/is_send_client")
+    public JSONObject updateRiskEventIsSendClient(@RequestParam("risk_id") String riskId) {
+        return riskBusinessService.updateIsSendClient(riskId);
+    }
 }
 

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

@@ -813,7 +813,7 @@
             AND t.refund_id IS NULL
             AND t.transaction_type = 'Credit'
             AND t.channel != 'System'
-            WHERE t.system_transaction_id = #{order_id} AND p.client_id = #{client_id}
+            WHERE t.order_id = #{order_id} AND p.client_id = #{client_id}
     </select>
 
     <select id="listHalloweenActOrder" resultType="com.alibaba.fastjson.JSONObject">

src/main/resources/templates/mail/risk_upload_mail.html

@@ -35,6 +35,7 @@
         </tr>
         </tbody>
     </table>
+    <p th:if="${description != null}">2、<span th:text="${description}"></span></p>
     <p>如果提交的材料不齐， 则有关停支付的风险。<!--还请按时提供商户材料并直接回复该邮件， -->感谢，辛苦。</p>
     <!--<p>请点击此链接上传所需材料<a th:href="${uploadUrl}"><span th:text="${uploadUrl}"></span></a></p>-->
     <p><a th:href="${uploadUrl}" style="color: rgb(255, 255, 255); text-align: center; padding: 12px 10px; height: 100%; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; text-decoration: none; background-color: #00c0ef; min-width: 150px;"><strong>Submit Risk Materials</strong></a></p>