From 70a39b9dcd01b8f50ee75e5078285e2ae7dba4f1 Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Fri, 28 Jul 2023 14:09:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E9=80=81=E7=9A=84?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=B6=88=E6=81=AF=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PushInvoiceServiceImpl.java | 25 ++++++++++--------- .../service/impl/InvoicePushServiceImpl.java | 6 ++--- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index 9b5fa69f..25d06e17 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -382,7 +382,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { pushInfoRecord.setResult(result); pushInfoRecord.setCreateTime(new Date()); if(pushInfoRecordId!=null){ - pushInfoRecordMapper.updateByPrimaryKeySelective(pushInfoRecord); + pushInfoRecordMapper.updateByPrimaryKey(pushInfoRecord); }else { pushInfoRecordMapper.insert(pushInfoRecord); } @@ -407,7 +407,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { pushInfoRecord.setFailReason(failReason); pushInfoRecord.setCreateTime(new Date()); if(pushInfoRecordId!=null){ - pushInfoRecordMapper.updateByPrimaryKeySelective(pushInfoRecord); + pushInfoRecordMapper.updateByPrimaryKey(pushInfoRecord); }else { pushInfoRecordMapper.insert(pushInfoRecord); } @@ -459,7 +459,6 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { } pushUrl = pushInfo.getPushUrl(); //按照接口类型获取对应的报文数据 - //推送影像系统 String content = getPushContent(fpTsMqData, pushInfo, shList); if (StrUtil.isBlank(content)) { String error=String.format("税号:%s,组装请求报文为空,不进行推送数据",fpTsMqData.getNsrsbh()); @@ -471,12 +470,12 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { //推送影像系统 sendImageSys(content,fpTsMqData.getPushType(),pushInfo); } catch (Exception e) { - String error=String.format("影像推送出现异常%s,推送类型%s",e.getMessage(),fpTsMqData.getPushType()); + String error=String.format("影像推送出现异常%s,推送类型%s",e,fpTsMqData.getPushType()); log.error(error); PushInfo pushInfo1 = new PushInfo(); pushInfo1.setId(pushInfo.getId()); - pushInfo1.setByzd1("yxxt"); - failPush(null,JsonUtils.getInstance().toJsonString(fpTsMqData),error,error,pushInfo,fpTsMqData.getPushType()); + pushInfo1.setByzd1("YXXT"); + failPush(null,JsonUtils.getInstance().toJsonString(fpTsMqData),error,e.getMessage(),pushInfo1,fpTsMqData.getPushType()); e.printStackTrace(); } OrderProcessInfo orderProcessInfo = null; @@ -649,20 +648,22 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { } } catch (Exception e) { //多路径推送,返回数据异常后继续推送 - log.error("{}推送企业异常,异常信息:{}", LOGGER_MSG, e); + String error=String.format("%s推送企业异常,异常信息:%s",LOGGER_MSG,e); + log.error(error); errorMsg = e.getMessage(); r = processPushFail(fpTsMqData, pushUrl, errorMsg, shList); sendPushDelay = true; - failPush(null,JsonUtils.getInstance().toJsonString(fpTsMqData),errorMsg,errorMsg,pushInfo,fpTsMqData.getPushType()); + failPush(null,JsonUtils.getInstance().toJsonString(fpTsMqData),error,errorMsg,pushInfo,fpTsMqData.getPushType()); } } } catch (Exception e) { - log.error("{}推送异常，异常信息:{}", LOGGER_MSG, e); + String error=String.format("%s推送异常，异常信息:%s",LOGGER_MSG,e); + log.error(error); errorMsg = e.getMessage(); r = processPushFail(fpTsMqData, pushUrl, errorMsg, shList); sendPushDelay = true; - failPush(null,JsonUtils.getInstance().toJsonString(fpTsMqData),errorMsg,errorMsg,null,fpTsMqData.getPushType()); + failPush(null,JsonUtils.getInstance().toJsonString(fpTsMqData),error,errorMsg,null,fpTsMqData.getPushType()); } //如果需要放入延时队列需要存入队列中 if (sendPushDelay) { @@ -674,7 +675,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { public void sendImageSys(String content, String pushType, PushInfo pushInfo){ PushInfo pushInfo1 = new PushInfo(); pushInfo1.setId(pushInfo.getId()); - pushInfo1.setByzd1("yxxt"); + pushInfo1.setByzd1("YXXT"); DdfpzxxV5 ddfpzxxV5 = JsonUtils.getInstance().parseObject(content.substring(1,content.length()-1), DdfpzxxV5.class); DdfpxxV5 ddfpxx = ddfpzxxV5.getDDFPXX(); OutputInvoiceRequest outputInvoiceRequest = buildInvoiceRequest(ddfpxx); @@ -719,7 +720,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { String error=String.format("影像系统推送数据异常，%s ,推送类型为%s",e.getMessage(),pushType); log.error(error); e.printStackTrace(); - failPush(null,content,error,error,pushInfo1,pushType); + failPush(null,content,error,e.getMessage(),pushInfo1,pushType); } } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoicePushServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoicePushServiceImpl.java index e5bbd0f1..9217a0e7 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoicePushServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoicePushServiceImpl.java @@ -130,7 +130,7 @@ public class InvoicePushServiceImpl implements InvoicePushService { return r; } //判断是不是影像的推送 - if ("yxxt".equals(pushInfoRecord.getQyType())) { + if ("YXXT".equals(pushInfoRecord.getQyType())) { try { //推送影像系统 pushInvoiceService.sendImageSys(content, fpTsMqData.getPushType(), pushInfo); @@ -138,8 +138,8 @@ public class InvoicePushServiceImpl implements InvoicePushService { } catch (Exception e) { String error = String.format("影像推送出现异常%s,推送类型%s", e.getMessage(), fpTsMqData.getPushType()); log.error(error); - pushInfo.setByzd1("yxxt"); - pushInvoiceService.failPush(pushInfoRecordId, JsonUtils.getInstance().toJsonString(fpTsMqData), error, error, pushInfo, fpTsMqData.getPushType()); + pushInfo.setByzd1("YXXT"); + pushInvoiceService.failPush(pushInfoRecordId, JsonUtils.getInstance().toJsonString(fpTsMqData), error, e.getMessage(), pushInfo, fpTsMqData.getPushType()); e.printStackTrace(); r.put(OrderManagementConstant.CODE, "9999"); r.put(OrderManagementConstant.ALL_MESSAGE, error);