fix 代充任务错误信息

netflix-service/src/main/java/com/cyksj/server/recharge/dto/TaskResult.java

@@ -1,40 +1,28 @@
 package com.cyksj.server.recharge.dto;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
 /**
  * 任务查询结果
  */
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class TaskResult {
     private String status;
     private String result;
-
-    public TaskResult() {}
-
-    public TaskResult(String status, String result) {
-        this.status = status;
-        this.result = result;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getResult() {
-        return result;
-    }
-
-    public void setResult(String result) {
-        this.result = result;
-    }
+    private String error;
 
     @Override
     public String toString() {
         return "TaskResult{" +
                 "status='" + status + '\'' +
                 ", result='" + result + '\'' +
+                ", error='" + error + '\'' +
                 '}';
     }
 }

netflix-service/src/main/java/com/cyksj/server/recharge/impl/GptProxyRechargeServiceImpl.java

@@ -29,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author chan
@@ -168,11 +169,12 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
             JSONObject jsonResponse = JSONUtil.parseObj(body);
             TaskResult result = new TaskResult(
                 jsonResponse.getStr("status"),
-                jsonResponse.getStr("result")
+                jsonResponse.getStr("result"),
+                jsonResponse.getStr("error")
             );
             log.info("任务查询结果: {}", result);
 	        String status = result.getStatus();
-			String resultResult = result.getResult();
+	        String resultResult = Optional.ofNullable(result.getError()).orElse(result.getResult());
 			//更新代充状态
 			resetGroupsRelationRechargeStatus(taskId, status, resultResult);
 	        return result;

netflix-service/src/main/java/com/cyksj/service/mange/gpt/impl/GptRechargeServiceImpl.java

@@ -31,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -228,11 +229,12 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 			JSONObject jsonResponse = JSONUtil.parseObj(body);
 			TaskResult result = new TaskResult(
 					jsonResponse.getStr("status"),
-					jsonResponse.getStr("result")
+					jsonResponse.getStr("result"),
+					jsonResponse.getStr("error")
 			);
 			log.info("任务查询结果: {}", result);
 			String status = result.getStatus();
-			String resultResult = result.getResult();
+			String resultResult = Optional.ofNullable(result.getError()).orElse(result.getResult());
 			//更新代充状态
 			resetGroupsRelationRechargeStatus(taskId, status, resultResult);
 			return result;