From 2ff34ebe7edc390868b42ac85827f0577e891796 Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Wed, 26 Jun 2024 17:02:59 +0800
Subject: [PATCH] =?UTF-8?q?cbs=E6=94=AF=E4=BB=98=20=E4=BB=A3=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/req/PaymentApplySubmitReqDTO.java     | 63 +++++++++++++++++++
 .../cbs8/service/impl/Cbs8ServiceImpl.java    |  2 +-
 .../com/hzya/frame/cbs8/util/PayState.java    |  6 +-
 3 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/req/PaymentApplySubmitReqDTO.java b/service/src/main/java/com/hzya/frame/cbs8/dto/req/PaymentApplySubmitReqDTO.java
index ed5e55a7..863ecb63 100644
--- a/service/src/main/java/com/hzya/frame/cbs8/dto/req/PaymentApplySubmitReqDTO.java
+++ b/service/src/main/java/com/hzya/frame/cbs8/dto/req/PaymentApplySubmitReqDTO.java
@@ -44,6 +44,13 @@ public class PaymentApplySubmitReqDTO {
     private String cityFlag;
     //银行备用字段 一共8个
     private String bankExtend1;
+    private String bankExtend2;
+    private String bankExtend3;
+    private String bankExtend4;
+    private String bankExtend5;
+    private String bankExtend6;
+    private String bankExtend7;
+    private String bankExtend8;
 
     //客户备用字段1
     private String erpExtend1;
@@ -179,4 +186,60 @@ public class PaymentApplySubmitReqDTO {
     public void setErpExtend3(String erpExtend3) {
         this.erpExtend3 = erpExtend3;
     }
+
+    public String getBankExtend2() {
+        return bankExtend2;
+    }
+
+    public void setBankExtend2(String bankExtend2) {
+        this.bankExtend2 = bankExtend2;
+    }
+
+    public String getBankExtend3() {
+        return bankExtend3;
+    }
+
+    public void setBankExtend3(String bankExtend3) {
+        this.bankExtend3 = bankExtend3;
+    }
+
+    public String getBankExtend4() {
+        return bankExtend4;
+    }
+
+    public void setBankExtend4(String bankExtend4) {
+        this.bankExtend4 = bankExtend4;
+    }
+
+    public String getBankExtend5() {
+        return bankExtend5;
+    }
+
+    public void setBankExtend5(String bankExtend5) {
+        this.bankExtend5 = bankExtend5;
+    }
+
+    public String getBankExtend6() {
+        return bankExtend6;
+    }
+
+    public void setBankExtend6(String bankExtend6) {
+        this.bankExtend6 = bankExtend6;
+    }
+
+    public String getBankExtend7() {
+        return bankExtend7;
+    }
+
+    public void setBankExtend7(String bankExtend7) {
+        this.bankExtend7 = bankExtend7;
+    }
+
+    public String getBankExtend8() {
+        return bankExtend8;
+    }
+
+    public void setBankExtend8(String bankExtend8) {
+        this.bankExtend8 = bankExtend8;
+    }
 }
diff --git a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ServiceImpl.java b/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ServiceImpl.java
index d361c63b..6b57738e 100644
--- a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ServiceImpl.java
@@ -210,7 +210,7 @@ public class Cbs8ServiceImpl implements ICbs8Service {
             List<JSONObject> dataList = cbsResponseDTO.getData();
             if (CollectionUtils.isNotEmpty(dataList)){
                 JSONObject o = dataList.get(0);
-                PayResponseDTO payResponseDTO = JSON.toJavaObject(o, PayResponseDTO.class);
+               PayResponseDTO payResponseDTO = JSON.toJavaObject(o, PayResponseDTO.class);
                 return payResponseDTO;
             }
         }
diff --git a/service/src/main/java/com/hzya/frame/cbs8/util/PayState.java b/service/src/main/java/com/hzya/frame/cbs8/util/PayState.java
index 8e1626b0..0ab494c7 100644
--- a/service/src/main/java/com/hzya/frame/cbs8/util/PayState.java
+++ b/service/src/main/java/com/hzya/frame/cbs8/util/PayState.java
@@ -25,13 +25,15 @@ public enum PayState {
     one("1","待处理"),
     two("2","审批中"),
     three("3","处理失败"),
-    four("4","审批通过"),
+    four("4","审批完成"),
     five("5","审批撤销"),
     six("6","审批拒绝"),
     seven("7","待发送审批"),
     eight("8","集中受理中"),
     nine("9","审批退回"),
-    ten("10","未处理");
+    ten("10","预处理中"),
+    eleven("11","预处理拒绝"),
+    twelve("12","资金监控审批中");
 
 
     //类型