From 7ef5aba72867c9fd485f340fec3fcf301c336194 Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Tue, 16 Jul 2024 15:01:12 +0800
Subject: [PATCH] =?UTF-8?q?cbs=E6=8F=92=E4=BB=B6=E6=B5=8B=E8=AF=95=202024?=
 =?UTF-8?q?=E5=B9=B47=E6=9C=8816=E6=97=A5=2015:01:07?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/cbs8/plugin/ElecBillPluginInitializer.java    | 3 ++-
 .../cbs8/plugin/TransactionDetailPluginInitializer.java  | 4 ++--
 .../plugin/cbs8/service/impl/CbsPluginServiceImpl.java   | 9 +++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/ElecBillPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/ElecBillPluginInitializer.java
index 685cef93..e51e66c8 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/ElecBillPluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/ElecBillPluginInitializer.java
@@ -3,6 +3,7 @@ package com.hzya.frame.plugin.cbs8.plugin;
 import com.alibaba.fastjson.JSONObject;
 import com.hzya.frame.base.PluginBaseEntity;
 import com.hzya.frame.plugin.cbs8.service.ICbsPluginService;
+import com.hzya.frame.web.entity.BaseResult;
 import com.hzya.frame.web.entity.JsonResultEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -96,6 +97,6 @@ public class ElecBillPluginInitializer extends PluginBaseEntity {
     @Override
     public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
         cbsPluginService.elecBillUpload(requestJson);
-        return null;
+        return BaseResult.getSuccessMessageEntity("cbs8电子回单插件执行成功");
     }
 }
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 de84e734..23a87f8b 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
@@ -7,6 +7,7 @@ import com.hzya.frame.cbs8.dto.req.TransactionDetailReqDTO;
 import com.hzya.frame.cbs8.dto.res.TransactionDetailDTO;
 import com.hzya.frame.cbs8.util.CBSUtil;
 import com.hzya.frame.plugin.cbs8.service.ICbsPluginService;
+import com.hzya.frame.web.entity.BaseResult;
 import com.hzya.frame.web.entity.JsonResultEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -120,7 +121,6 @@ public class TransactionDetailPluginInitializer extends PluginBaseEntity {
         List<TransactionDetailDTO> transactionDetailList = cbsPluginService.queryTransactionDetail(transactionDetailReqDTO);
         //保存交易明细到OA底表
         cbsPluginService.saveTransactionDetail(transactionDetailList);
-        return new JsonResultEntity("成功",true,transactionDetailList);
-        //return null;
+        return BaseResult.getSuccessMessageEntity("成功",transactionDetailList);
     }
 }
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 9cf81f6b..31c3d52f 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
@@ -213,10 +213,11 @@ public class CbsPluginServiceImpl implements ICbsPluginService {
     public void elecBillUpload(JSONObject requestJson) throws Exception {
         //查询支付成功 没有电子回单的数据
         PaymentEntity paymentEntity = new PaymentEntity();
-       // List<PaymentEntity> paymentList = paymentService.queryElecIsNull(paymentEntity);
-        paymentEntity.setPayDate("2024-06-20");
-        paymentEntity.setReferenceNum("41");
-        List<PaymentEntity> paymentList = Arrays.asList(paymentEntity);
+        paymentEntity.setDataSourceCode(oa_data_source_code);
+        List<PaymentEntity> paymentList = paymentService.queryElecIsNull(paymentEntity);
+        //paymentEntity.setPayDate("2024-06-20");
+        //paymentEntity.setReferenceNum("41");
+        //List<PaymentEntity> paymentList = Arrays.asList(paymentEntity);
         if (CollectionUtils.isNotEmpty(paymentList)) {
             for (PaymentEntity pay : paymentList) {
                 try {