From cd5523535214fc1b254ff3e761a868c94f230a4c Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei@baicgroup.com.cn>
Date: Mon, 11 Sep 2023 14:54:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E4=B8=AD=E5=8F=B0=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5-=E8=AF=84=E5=88=86=E6=8E=A8=E9=80=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AE=8C=E5=96=84=E5=A4=B1=E8=B4=A5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ample/esb/server/ScoreResultServlet.java  | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/com/ample/esb/server/ScoreResultServlet.java b/src/com/ample/esb/server/ScoreResultServlet.java
index 550ea0a46..641fd6388 100644
--- a/src/com/ample/esb/server/ScoreResultServlet.java
+++ b/src/com/ample/esb/server/ScoreResultServlet.java
@@ -39,6 +39,7 @@ public class ScoreResultServlet  extends HttpServlet {
         response.setCharacterEncoding("utf-8");
         PrintWriter out = null;
         String resultXml = null;
+        String res = null;
         try {
             out = response.getWriter();
             BufferedReader in = new BufferedReader(new InputStreamReader(request.getInputStream(), "UTF-8"));
@@ -49,13 +50,12 @@ public class ScoreResultServlet  extends HttpServlet {
             }
             resultXml = sb.toString();
             ARE.getLog().info("接收到Rpt记录：" + resultXml);
-            out.print(updateResult(resultXml));
-            System.out.println("评分结果推送接收接口请求回调结束!");
-            out.close();
         } catch (Exception e) {
             e.printStackTrace();
         }
-
+        out.print(updateResult(resultXml));
+        System.out.println("评分结果推送接收接口请求回调结束!");
+        out.close();
 
     }
 
@@ -109,20 +109,13 @@ public class ScoreResultServlet  extends HttpServlet {
 
     }
 
-    public String updateResult(String requestXml) throws Exception{
+    public String updateResult(String requestXml) {
         Transaction tran = (Transaction) XstreamUtil.objectConvert(requestXml);
         String logPath = BaicPropertiesUtil.get("log_path");
         String globalSeqNo = tran.getMessageEsbHead().getGlobalSeqNo();
         String projectNo = tran.getMessageBody().getAfsResultRequest().getApplyNo();
         FileUtil.writeFile(logPath + projectNo +"_"+ globalSeqNo +"_request.txt", requestXml);
-        String fraudAlert = tran.getMessageBody().getAfsResultRequest().getFraudAlert();
-        String actionTaken = tran.getMessageBody().getAfsResultRequest().getActionTaken();
-        try {
-            savePushLog(requestXml);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
+        String RetCommStatus = "S";
         Response rs = new Response();
         rs.setResult("Successful");
         MessageBody mb = new MessageBody();
@@ -133,11 +126,19 @@ public class ScoreResultServlet  extends HttpServlet {
         esbHead.setTargetMachineTime(DateUtils.TimeNowAccurate());
         esbHead.setTargetReciveDate(DateUtils.dateNow());
         esbHead.setTargetReciveTime(DateUtils.TimeNowAccurate());
-        esbHead.setRetCommStatus("S");
         esbHead.setRetCode("000000");
         esbHead.setRetMsg("成功");
         esbHead.setRetSystemId("APF");
-
+        try {
+            savePushLog(requestXml);
+        } catch (Exception e) {
+            e.printStackTrace();
+            tran.setMessageBody(null);
+            RetCommStatus = "F";
+            esbHead.setRetCode("99999");
+            esbHead.setRetMsg("失败："+e.getMessage());
+        }
+        esbHead.setRetCommStatus(RetCommStatus);
         MessageAppHead appHead = tran.getMessageAppHead();
         appHead.setTargetTranDate(DateUtils.dateNow());
         appHead.setTargetTranTime(DateUtils.TimeNowAccurate());