From c034abc1d54e579231c5d04b00a9b0208832eb01 Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Thu, 4 Jul 2024 16:13:09 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0oa=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildpackage/src/main/resources/application-yuecheng.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/buildpackage/src/main/resources/application-yuecheng.yml b/buildpackage/src/main/resources/application-yuecheng.yml
index c0c6c6d4..ec161bc5 100644
--- a/buildpackage/src/main/resources/application-yuecheng.yml
+++ b/buildpackage/src/main/resources/application-yuecheng.yml
@@ -28,4 +28,6 @@ cbs8:
   # 这个私钥到时候上传到cbs，和下面到是同一对
   #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46
   ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde
-  cbs_public_key: 0469146F06BF3B01236E84632441E826F3067A6B93BC3839C836A06007869CD351FBBE388B51F742859388BBC1DE089923AAFBC69E448F15141DDF30EE6CE90185
\ No newline at end of file
+  cbs_public_key: 0469146F06BF3B01236E84632441E826F3067A6B93BC3839C836A06007869CD351FBBE388B51F742859388BBC1DE089923AAFBC69E448F15141DDF30EE6CE90185
+OA:
+  data_source_code: OA
\ No newline at end of file

From 49aaccd8faf09ed0cf1a5d6d3a66e6b0343ee518 Mon Sep 17 00:00:00 2001
From: yuqh <123456>
Date: Thu, 4 Jul 2024 16:14:50 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../seeyon/paybill/entity/PayBillEntity.java   | 18 ++++++++++++++++++
 .../seeyon/paybill/entity/PayBillEntity.xml    | 12 ++++++++++--
 .../service/impl/PayBillServiceImpl.java       |  2 ++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.java b/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.java
index 1b599a58..635b27a1 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.java
+++ b/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.java
@@ -27,6 +27,24 @@ public class PayBillEntity extends BaseEntity {
     private String pkBalatype;//结算方式
     private String billCode;//单据编号
     private String queryState;
+    private String pkRecproject;//收款方名称
+    private String memo;//摘要
+
+    public String getPkRecproject() {
+        return pkRecproject;
+    }
+
+    public void setPkRecproject(String pkRecproject) {
+        this.pkRecproject = pkRecproject;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
 
     public String getQueryState() {
         return queryState;
diff --git a/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.xml b/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.xml
index 446d2abb..8e4c56ec 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.xml
+++ b/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.xml
@@ -12,12 +12,14 @@
         <result property="fieldName" column="field_name" jdbcType="VARCHAR"/>
         <result property="pkBalatype" column="pk_balatype" jdbcType="VARCHAR"/>
         <result property="billCode" column="bill_code" jdbcType="VARCHAR"/>
+        <result property="memo" column="memo" jdbcType="VARCHAR"/>
+        <result property="pkRecproject" column="pk_recproject" jdbcType="VARCHAR"/>
 
     </resultMap>
 
     <!--工程项目查询-->
     <select id="PayBillEntity_list_base" resultMap="get-PayBillEntity-result" parameterType="com.hzya.frame.seeyon.paybill.entity.PayBillEntity">
-       select bill_code,id,bill_date,primal_money,pk_oppaccount,pk_supplier,pk_org,pk_balatype,table_name,field_name,send_state from (
+       select bill_code,m1.id,bill_date,formmain_0236.field0003 as pk_recproject,memo,primal_money,pk_oppaccount,pk_supplier,pk_org,pk_balatype,table_name,field_name,send_state from (
        SELECT
         body.id as id,
         field0001 as bill_code,
@@ -27,6 +29,8 @@
         field0083 AS pk_supplier,
         field0089 AS pk_org,
         field0091 AS pk_balatype,
+        field0090 AS pk_recproject_code,
+        field0082 AS memo,
         'formson_0222' as table_name,
         'field0084' as field_name,
          field0084  as send_state
@@ -43,6 +47,8 @@
         field0077 AS pk_supplier,
         field0082 AS pk_org,
         field0084 AS pk_balatype,
+        field0083 AS pk_recproject,
+        field0076 AS memo,
         'formson_0210' as table_name,
         'field0078' as field_name,
          field0078  as send_state
@@ -59,13 +65,15 @@
         field0057 AS pk_supplier,
         field0061 AS pk_org,
          field0063 AS pk_balatype,
+        field0062 AS pk_recproject,
+        field0056 AS memo,
         'formson_0223' as table_name,
         'field0058' as field_name,
         field0058  as send_state
         FROM formmain_0094 main
         LEFT JOIN formson_0223 body ON main.id = body.formmain_id
         WHERE field0053 IS NOT NULL  and finishedflag = '1'
-       )m1
+       )m1 left join formmain_0236 on m1.pk_recproject_code = formmain_0236.field0002
         <trim prefix="where" prefixOverrides="and">
             <if test="id != null and id != ''"> and id = #{id} </if>
             <if test="queryState != null and queryState != ''"> and send_state is null</if>
diff --git a/service/src/main/java/com/hzya/frame/seeyon/paybill/service/impl/PayBillServiceImpl.java b/service/src/main/java/com/hzya/frame/seeyon/paybill/service/impl/PayBillServiceImpl.java
index 140bfdbb..93d405d5 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/paybill/service/impl/PayBillServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/seeyon/paybill/service/impl/PayBillServiceImpl.java
@@ -154,6 +154,8 @@ public class PayBillServiceImpl extends BaseService<PaymentEntity,String> implem
         body.put("direction","-1");//方向 :1=收;-1=付;
         body.put("objecttype","0");//交易对象
         body.put("pk_customer",pay.getPkSupplier());//客户
+        body.put("pk_recproject",pay.getPkRecproject());//收支项目
+        body.put("memo",pay.getMemo());//摘要
         String pkOppaccount = "";
         if(StrUtil.isNotEmpty(pay.getPkOppaccount())){
             pkOppaccount = pay.getPkOppaccount().replaceAll(" ","");

From 5550b7fe79cfd06f54459079af4ee041cf370afe Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Thu, 4 Jul 2024 16:17:48 +0800
Subject: [PATCH 3/5] =?UTF-8?q?oa=E6=95=B0=E6=8D=AE=E6=BA=90=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildpackage/src/main/resources/application-yc.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildpackage/src/main/resources/application-yc.yml b/buildpackage/src/main/resources/application-yc.yml
index 5560efe8..053cef86 100644
--- a/buildpackage/src/main/resources/application-yc.yml
+++ b/buildpackage/src/main/resources/application-yc.yml
@@ -87,4 +87,4 @@ cbs8:
   #电子回单下载临时存放位置
   elec_path: /zt/elecfile
 OA:
-  data_source_code: yc_oa
\ No newline at end of file
+  data_source_code: OA
\ No newline at end of file

From 81448dbc473b8a5abbe3e2098da6bbe67da81fdd Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Thu, 4 Jul 2024 16:53:56 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8F=91=E6=94=BE?=
 =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=94=AF=E4=BB=98=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=AD=97=E6=AE=B5=202024=E5=B9=B47=E6=9C=884=E6=97=A5?=
 =?UTF-8?q?=2016:53:50?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frame/seeyon/cbs8/entity/AgentPaymentEntity.java  | 11 ++++++++++-
 .../frame/seeyon/cbs8/entity/AgentPaymentEntity.xml   |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java
index b4b2748a..65b9ea9a 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java
+++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java
@@ -35,7 +35,8 @@ public class AgentPaymentEntity extends BaseEntity {
     private String applyCode;
     //支付结果
     private String payResult;
-
+    //支付日期
+    private String payDate;
     private String tableName;//表名称
     private String billName;//单据名称
 
@@ -142,4 +143,12 @@ public class AgentPaymentEntity extends BaseEntity {
     public void setPayResult(String payResult) {
         this.payResult = payResult;
     }
+
+    public String getPayDate() {
+        return payDate;
+    }
+
+    public void setPayDate(String payDate) {
+        this.payDate = payDate;
+    }
 }
diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml
index d67b0b46..e83daca0 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml
+++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml
@@ -120,6 +120,7 @@
         update formmain_0224 set
         <trim suffix="" suffixOverrides=",">
             <if test="applyCode != null and applyCode !='' ">field0043 =#{applyCode},</if>
+            <if test="payDate != null and payDate !='' ">field0058 =#{payDate},</if>
             <if test="payResult != null and payResult !='' ">field0046 =#{payResult}</if>
         </trim>
         where id = #{oaId}

From 68083196eeccad1fdf279ccb2bede54b8280b353 Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Thu, 4 Jul 2024 16:54:37 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B7=A5=E8=B5=84?=
 =?UTF-8?q?=E5=8F=91=E6=94=BE=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=8A=8A=E6=94=AF=E4=BB=98=E6=97=B6=E9=97=B4=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=88=B0=E4=B8=BB=E8=A1=A8=202024=E5=B9=B47=E6=9C=884?=
 =?UTF-8?q?=E6=97=A5=2016:54:31?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java
index 5f0c5f1d..81d79be3 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java
@@ -371,7 +371,7 @@ public class CbsPluginServiceImpl implements ICbsPluginService {
                         } else {
                             result.setPayResult(PayState.payStateGetValue(pay_status));//支付状态 支付状态和支付申请状态用一个
                         }
-                        agentPaymentService.updateResult(result);
+
                         //更新明细表
                         List<AgentPayQueryDTO> agentDetails = agentPayResultResDTO.getAgentDetails();
                         for (AgentPayQueryDTO d : agentDetails) {
@@ -386,6 +386,8 @@ public class CbsPluginServiceImpl implements ICbsPluginService {
                             detail.setDataSourceCode(oa_data_source_code);
                             agentPaymentDetailService.updatePayResult(detail);
                         }
+                        result.setPayDate(CBSUtil.convertTimestampToString(agentDetails.get(0).getDtlPayTime()));
+                        agentPaymentService.updateResult(result);
                     }
                 }
                 return agentPayResultResDTO;