From c713bc095b8963bb577f42560b03f67c8228fa19 Mon Sep 17 00:00:00 2001
From: zhengyf <zyf654042662@163.com>
Date: Fri, 29 Nov 2024 10:42:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A=E9=92=89=E9=92=89?=
 =?UTF-8?q?=E8=A1=A5=E6=8E=A8=E6=8A=A5=E9=94=99=E6=8F=90=E7=A4=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dingtalk/controller/DingU8CBillController.java |  2 +-
 .../service/impl/DingU8cBillServiceImpl.java       | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/controller/DingU8CBillController.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/controller/DingU8CBillController.java
index 946bbf63..2b8b86a7 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/controller/DingU8CBillController.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/controller/DingU8CBillController.java
@@ -78,7 +78,7 @@ public class DingU8CBillController extends DefaultController {
             }
             return getSuccessMessageEntity("根据Id补推",query);
         }catch (Exception e){
-            return getFailureMessageEntity("根据Id补推失败,失败原因：{}。",e.getMessage());
+            return getFailureMessageEntity("根据Id补推失败。",e.getMessage());
         }
     }
 
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/service/impl/DingU8cBillServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/service/impl/DingU8cBillServiceImpl.java
index 35df1502..f688f523 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/service/impl/DingU8cBillServiceImpl.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/service/impl/DingU8cBillServiceImpl.java
@@ -104,15 +104,18 @@ public class DingU8cBillServiceImpl extends BaseService<DingU8cBillEntity, Strin
 	 */
 	@Override
 	public DingU8cBillEntity pushById(DingU8cBillEntity dingU8cBillEntity) {
-		try{
+
+		DingU8cBillEntity dingU8cBillEntityNew=null;
+
 			Assert.notNull(dingU8cBillEntity,"dingU8cBillEntity不能未空");
 			Assert.notNull(dingU8cBillEntity.getId(),"ID不能未空");
 			dingU8cBillEntity.setInitiate(null);
 			List<DingU8cBillEntity> query = dingU8cBillDao.query(dingU8cBillEntity);
+		try{
 			if(query.size()==0){
 				Assert.state(false,"根据id：{},查询失败，未查询到数据。",dingU8cBillEntity.getId());
 			}
-			DingU8cBillEntity dingU8cBillEntityNew = query.get(0);
+			dingU8cBillEntityNew = query.get(0);
 
 			//没有推送成功的
 			if(dingU8cBillEntityNew.getDing_talk_process_id()==null||"".equals(dingU8cBillEntityNew.getDing_talk_process_id().trim())){
@@ -156,7 +159,12 @@ public class DingU8cBillServiceImpl extends BaseService<DingU8cBillEntity, Strin
 			}
 			return dingU8cBillEntityNew;
 		}catch (Exception e){
-			Assert.state(false,e.getMessage());
+			if(dingU8cBillEntityNew != null){
+				Assert.state(false,"根据公司编码：{}，单据号：{}，实例id：{}补推失败，失败原因：{}",e.getMessage());
+			}else {
+				Assert.state(false,e.getMessage());
+
+			}
 		}
 		return null;
 	}