From 907a5f057fcb81f0a70ad06687b22cebf5120ac4 Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Thu, 20 Jun 2024 13:51:04 +0800
Subject: [PATCH] =?UTF-8?q?cbs8=20=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cbs8/plugin/PayApplyPluginInitializer.java    |  6 ++++--
 .../TransactionDetailPluginInitializer.java       | 15 ++++++++++++++-
 .../cbs8/service/impl/CbsPluginServiceImpl.java   |  7 +++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java
index f7ebeaed..83886054 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java
@@ -97,12 +97,14 @@ public class PayApplyPluginInitializer extends PluginBaseEntity {
      **/
     @Override
     public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
-        PaymentEntity paymentEntity;
+        PaymentEntity paymentEntity = null;
         if (null != requestJson){
             requestJson.remove("jsonStr");
+            paymentEntity = JSONObject.parseObject(requestJson.toString(),PaymentEntity.class);
         }
+        if (null == paymentEntity)
+            paymentEntity = new PaymentEntity();
         //支付申请
-        paymentEntity = new PaymentEntity();
         paymentEntity.setOaId("5490849762671477371");
         cbsPluginService.applyPay(paymentEntity);
         return null;
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/TransactionDetailPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/TransactionDetailPluginInitializer.java
index e65b75dc..f9ad28b6 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/TransactionDetailPluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/TransactionDetailPluginInitializer.java
@@ -1,5 +1,6 @@
 package com.hzya.frame.plugin.cbs8.plugin;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.hzya.frame.base.PluginBaseEntity;
 import com.hzya.frame.cbs8.dto.req.TransactionDetailReqDTO;
@@ -101,10 +102,22 @@ public class TransactionDetailPluginInitializer extends PluginBaseEntity {
      **/
     @Override
     public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
-        TransactionDetailReqDTO transactionDetailReqDTO = new TransactionDetailReqDTO();
+        TransactionDetailReqDTO transactionDetailReqDTO = null;
+        if (null != requestJson){
+            requestJson.remove("jsonStr");
+            transactionDetailReqDTO = JSONObject.parseObject(requestJson.toString(),TransactionDetailReqDTO.class);
+        }
+        if (null == transactionDetailReqDTO){
+            transactionDetailReqDTO = new TransactionDetailReqDTO();
+        }
         transactionDetailReqDTO.setCurrentPage(CBSUtil.DEFAULT_CURRENT_PAGE);
         transactionDetailReqDTO.setPageSize(CBSUtil.DEFAULT_PAGE_SIZE);
+        transactionDetailReqDTO.setStartDate(DateUtil.today());
+        transactionDetailReqDTO.setEndDate(DateUtil.today());
+        transactionDetailReqDTO.setDateType("0");
+        transactionDetailReqDTO.setLoanType("2");
         List<TransactionDetailDTO> transactionDetailList = cbsPluginService.queryTransactionDetail(transactionDetailReqDTO);
+        System.out.println("11111");
         return null;
     }
 }
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 b58dec08..403fa53e 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
@@ -89,7 +89,14 @@ public class CbsPluginServiceImpl implements ICbsPluginService {
             for (PaymentEntity pay : paymentList) {
                 //调用支付申请接口
                 PayResponseDTO payResponseDTO = cbs8Service.payApply(pay);
+                boolean successed = payResponseDTO.getSuccessed();
+                if (successed){
+                    pay.setPayResult(PayState.p.getValue());
+                }else {
+                    pay.setPayResult("推送失败");
+                }
                 //4、更新OA表单
+                pay.setDataSourceCode(oa_data_source_code);
                 paymentService.updatePayState(pay);
                 //5、记录操作日志
                 cbsLogService.saveLog(new CbsLogEntity());