From 6b52d647ce15c972f1e597467cd9cc871d532b9a Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Fri, 4 Jul 2025 14:09:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E5=AD=97=E5=8F=91=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frame/plugin/nuonuo/dao/INuoNuoDao.java | 4 + .../plugin/nuonuo/dao/impl/NuoNuoDaoImpl.java | 8 + .../plugin/nuonuo/entity/NuoNuoEntity.java | 18 +++ .../plugin/nuonuo/entity/NuoNuoEntity.xml | 10 +- .../plugin/NuoNuoHcPluginInitializer.java | 2 +- .../plugin/nuonuo/service/INuoNuoService.java | 2 + .../service/impl/NuoNuoServiceImpl.java | 148 +++++++++++++----- .../test/java/com/hzya/frame/temButtom.java | 1 + .../impl/NuoNuoCallbackServiceImpl.java | 107 +++++++++---- 9 files changed, 228 insertions(+), 72 deletions(-) diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/dao/INuoNuoDao.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/dao/INuoNuoDao.java index 4704d507..2dc8836e 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/dao/INuoNuoDao.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/dao/INuoNuoDao.java @@ -3,8 +3,12 @@ package com.hzya.frame.plugin.nuonuo.dao; import com.hzya.frame.basedao.dao.IBaseDao; import com.hzya.frame.plugin.nuonuo.entity.NuoNuoEntity; +import java.util.List; + public interface INuoNuoDao extends IBaseDao { int updateHpdata(NuoNuoEntity nuoNuoEntity); + + List queryAffair(NuoNuoEntity nuoNuoEntity); } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/dao/impl/NuoNuoDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/dao/impl/NuoNuoDaoImpl.java index 40596689..9a0c1075 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/dao/impl/NuoNuoDaoImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/dao/impl/NuoNuoDaoImpl.java @@ -6,6 +6,8 @@ import com.hzya.frame.plugin.nuonuo.dao.INuoNuoDao; import com.hzya.frame.plugin.nuonuo.entity.NuoNuoEntity; import com.hzya.frame.seeyon.entity.NuoNuoCallbackEntity; +import java.util.List; + public class NuoNuoDaoImpl extends MybatisGenericDao implements INuoNuoDao { @@ -14,5 +16,11 @@ public class NuoNuoDaoImpl extends MybatisGenericDao imple public int updateHpdata(NuoNuoEntity entity) { return super.update(getSqlIdPrifx()+"updateHpdata",entity); } + @DS("#entity.dataSourceCode") + @Override + public List queryAffair(NuoNuoEntity entity) { + return (List) super.selectList(getSqlIdPrifx()+"queryAffair",entity); + + } } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/entity/NuoNuoEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/entity/NuoNuoEntity.java index 861d9dea..1aa49edb 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/entity/NuoNuoEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/entity/NuoNuoEntity.java @@ -10,7 +10,25 @@ public class NuoNuoEntity extends BaseEntity { private String field0193;//红字确认单描述 private String field0194;//红冲状态 private String field0195;//红冲描述 + private String affairId; + private String noname; + + public String getNoname() { + return noname; + } + + public void setNoname(String noname) { + this.noname = noname; + } + + public String getAffairId() { + return affairId; + } + + public void setAffairId(String affairId) { + this.affairId = affairId; + } @Override public String getId() { diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/entity/NuoNuoEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/entity/NuoNuoEntity.xml index 7d335638..dc5cd222 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/entity/NuoNuoEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/entity/NuoNuoEntity.xml @@ -2,8 +2,6 @@ - - update formmain_11970 set @@ -15,5 +13,13 @@ where id = #{id} + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/plugin/NuoNuoHcPluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/plugin/NuoNuoHcPluginInitializer.java index 3af98c81..4dad96d8 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/plugin/NuoNuoHcPluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/plugin/NuoNuoHcPluginInitializer.java @@ -51,7 +51,7 @@ public class NuoNuoHcPluginInitializer extends PluginBaseEntity{ public JsonResultEntity executeBusiness(JSONObject requestJson) { try { logger.info("======开始执行诺诺发票红冲同步========"); - return nuoNuoService.sendNuoNuoFaPiaoHc(requestJson); + return nuoNuoService.sendNuoNuoFaPiaoHp(requestJson); }catch (Exception e){ logger.info("======执行诺诺发票红冲同步失败:{}========",e.getMessage()); } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/service/INuoNuoService.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/service/INuoNuoService.java index e870fda2..560d1fdf 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/service/INuoNuoService.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/service/INuoNuoService.java @@ -32,4 +32,6 @@ public interface INuoNuoService extends IBaseService{ * @return com.hzya.frame.web.entity.JsonResultEntity **/ JsonResultEntity sendNuoNuoFaPiaoHc(JSONObject requestJson); + + JsonResultEntity sendNuoNuoFaPiaoHp(JSONObject requestJson); } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/service/impl/NuoNuoServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/service/impl/NuoNuoServiceImpl.java index 29617455..b6994e2e 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/service/impl/NuoNuoServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/service/impl/NuoNuoServiceImpl.java @@ -107,9 +107,8 @@ public class NuoNuoServiceImpl extends BaseService impleme sendData.put("buyerBank",mainData.getString("field0128"));//购方开户行 sendData.put("buyerAccount",mainData.getString("field0139"));//购方银行账号 sendData.put("orderNo",mainData.getString("field0001"));//订单编号 - //todo - sendData.put("bizCallbackUrl","http://10.0.2.112:9021/kangarooDataCenterV3/entranceController/nuoNuoCallback");//回调地址测试 - //sendData.put("bizCallbackUrl","http://10.0.2.112:9011/kangarooDataCenterV3/entranceController/nuoNuoCallback");//回调地址正式 + //sendData.put("bizCallbackUrl","http://10.0.2.112:9021/kangarooDataCenterV3/entranceController/nuoNuoCallback");//回调地址测试 + sendData.put("bizCallbackUrl","http://10.0.2.112:9011/kangarooDataCenterV3/entranceController/nuoNuoCallback");//回调地址正式 sendData.put("sellerName",mainData.getString("field0129"));//销方名称 sendData.put("sellerTaxnum",mainData.getString("field0162"));//销方税号 sendData.put("sellerAddress",mainData.getString("field0161"));//销方地址 @@ -221,24 +220,37 @@ public class NuoNuoServiceImpl extends BaseService impleme String tokenResult = HttpRequest.post(url). header("appId", "800051"). - header("apiCode", "8000510012").//todo 配置接口 + header("apiCode", "8000510013"). header("publicKey", "ZJYAM2YFEIsIaI1e4wMagkS2Q7SFgGk0RvsPhEES45m/OVFCe7eDIk+3zDUT+v578prj"). header("secretKey", "lR6+uf94mvNMclAB43oIwmhJSMDzQaViTkfXLeNvmGdpLfbFiUvbgbU+p43zO25Zj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="). body(sendData.toJSONString()). execute(). body(); - logger.error("推送诺诺发票确认单返回："+tokenResult); - JSONObject resoutJson = JSONObject.parseObject(tokenResult); - if(resoutJson.getBoolean("flag")){ - JSONObject attribute = requestJson.getJSONObject("attribute"); - NuoNuoEntity nuoNuoEntity = new NuoNuoEntity(); - nuoNuoEntity.setDataSourceCode("SW-OA"); - nuoNuoEntity.setId(mainData.getString("id")); - nuoNuoEntity.setField0191(attribute.getString("data")); - nuoNuoDao.updateHpdata(nuoNuoEntity); - return BaseResult.getSuccessMessageEntity("推送诺诺发票确认单成功"); - }else { - return BaseResult.getFailureMessageEntity("推送诺诺发票确认单失败："+resoutJson.getString("msg")); + logger.error("推送诺诺发票确认单返回1："+tokenResult); + try { + JSONObject resoutJson = JSONObject.parseObject(tokenResult); + logger.error("推送诺诺发票确认单返回2："+resoutJson.toJSONString()); + + if(resoutJson.getBoolean("flag")){ + try { + JSONObject attribute = resoutJson.getJSONObject("attribute"); + logger.error("推送诺诺发票确认单返回3："+attribute.toJSONString()); + NuoNuoEntity nuoNuoEntity = new NuoNuoEntity(); + nuoNuoEntity.setDataSourceCode("SW-OA"); + nuoNuoEntity.setId(mainData.getString("id")); + nuoNuoEntity.setField0191(attribute.getString("data")); + nuoNuoDao.updateHpdata(nuoNuoEntity); + }catch (Exception e){ + e.printStackTrace(); + logger.error("推送诺诺发票确认单保存错误"+e.getMessage()); + } + return BaseResult.getSuccessMessageEntity("推送诺诺发票确认单成功"); + }else { + return BaseResult.getFailureMessageEntity("推送诺诺发票确认单失败："+resoutJson.getString("msg")); + } + }catch (Exception e){ + logger.error("推送诺诺发票确认单保存错误1"+e.getMessage()); + return BaseResult.getFailureMessageEntity("推送诺诺发票确认单失败："+e.getMessage()); } } @@ -247,11 +259,19 @@ public class NuoNuoServiceImpl extends BaseService impleme sendData.put("applySource",0);//申请方身份：0 销方 sendData.put("taxNum",mainData.getString("field0162"));//销方税号 sendData.put("blueInvoiceNumber",mainData.getString("field0178"));//蓝子发票号 - //可能需要转换 - sendData.put("redReason",mainData.getString("field0190"));//冲红原因：1销货退回2开票有误3服务中止4销售折让 - //todo 切换地址 - sendData.put("bizCallbackUrl","http://10.0.2.112:9021/kangarooDataCenterV3/entranceController/nuoNuoQrdCallback");//回调地址测试 - //sendData.put("bizCallbackUrl","http://10.0.2.112:9011/kangarooDataCenterV3/entranceController/nuoNuoQrdCallback");//回调地址正式 + if(mainData.getString("field0190") != null){ + if("6299379468699910521".equals(mainData.getString("field0190"))){ + sendData.put("redReason","2");//冲红原因：1销货退回2开票有误3服务中止4销售折让 + }else if("1471920473864226411".equals(mainData.getString("field0190"))){ + sendData.put("redReason","3");//冲红原因：1销货退回2开票有误3服务中止4销售折让 + }else if("2608861944110465928".equals(mainData.getString("field0190"))){ + sendData.put("redReason","4");//冲红原因：1销货退回2开票有误3服务中止4销售折让 + }else if("-2754201006580086516".equals(mainData.getString("field0190"))){ + sendData.put("redReason","1");//冲红原因：1销货退回2开票有误3服务中止4销售折让 + } + } + //sendData.put("bizCallbackUrl","http://10.0.2.112:9021/kangarooDataCenterV3/entranceController/nuoNuoQrdCallback");//回调地址测试 + sendData.put("bizCallbackUrl","http://10.0.2.112:9011/kangarooDataCenterV3/entranceController/nuoNuoQrdCallback");//回调地址正式 return sendData; } @@ -281,25 +301,72 @@ public class NuoNuoServiceImpl extends BaseService impleme if(mainData.getString("field0168") != null && "SJ".equals(mainData.getString("field0168"))){ return BaseResult.getSuccessMessageEntity("发票类型为SJ，不传诺税通"); } - //组装发送数据 - JSONObject sendData = getSendDataHc(mainData,detailArray); - //发送数据 - logger.error("推送诺诺发票红冲推送："+sendData.toJSONString()); + if(mainData.getString("field0192") == null){ + return BaseResult.getSuccessMessageEntity("红字确认单状态为空"); + } + if("01".equals(mainData.getString("field0192") ) || "04".equals(mainData.getString("field0192") )){ + //组装发送数据 + JSONObject sendData = getSendDataHc(mainData,detailArray); + //发送数据 + logger.error("推送诺诺发票红冲推送："+sendData.toJSONString()); - String tokenResult = HttpRequest.post(url). - header("appId", "800051"). - header("apiCode", "8000510012").//todo 配置接口 - header("publicKey", "ZJYAM2YFEIsIaI1e4wMagkS2Q7SFgGk0RvsPhEES45m/OVFCe7eDIk+3zDUT+v578prj"). - header("secretKey", "lR6+uf94mvNMclAB43oIwmhJSMDzQaViTkfXLeNvmGdpLfbFiUvbgbU+p43zO25Zj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="). - body(sendData.toJSONString()). - execute(). - body(); - logger.error("推送诺诺发票红冲返回："+tokenResult); - JSONObject resoutJson = JSONObject.parseObject(tokenResult); - if(resoutJson.getBoolean("flag")){ - return BaseResult.getSuccessMessageEntity("推送诺诺发票红冲成功"); + String tokenResult = HttpRequest.post(url). + header("appId", "800051"). + header("apiCode", "8000510014"). + header("publicKey", "ZJYAM2YFEIsIaI1e4wMagkS2Q7SFgGk0RvsPhEES45m/OVFCe7eDIk+3zDUT+v578prj"). + header("secretKey", "lR6+uf94mvNMclAB43oIwmhJSMDzQaViTkfXLeNvmGdpLfbFiUvbgbU+p43zO25Zj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="). + body(sendData.toJSONString()). + execute(). + body(); + logger.error("推送诺诺发票红冲返回："+tokenResult); + JSONObject resoutJson = JSONObject.parseObject(tokenResult); + if(resoutJson.getBoolean("flag")){ + return BaseResult.getSuccessMessageEntity("推送诺诺发票红冲成功"); + }else { + return BaseResult.getFailureMessageEntity("推送诺诺发票红冲失败："+resoutJson.getString("msg")); + } }else { - return BaseResult.getFailureMessageEntity("推送诺诺发票红冲失败："+resoutJson.getString("msg")); + return BaseResult.getFailureMessageEntity("红字确认单状态错误"); + } + + } + + @Override + public JsonResultEntity sendNuoNuoFaPiaoHp(JSONObject requestJson) { + logger.error("诺诺发票红冲节点参数："+requestJson.toJSONString()); + JSONObject jsonStr = requestJson.getJSONObject("jsonStr"); + if(jsonStr == null ){ + return BaseResult.getFailureMessageEntity("系统错误"); + } + JSONObject businessDataStr = jsonStr.getJSONObject("businessDataStr"); + if(businessDataStr == null ){ + return BaseResult.getFailureMessageEntity("系统错误"); + } + + String affairId = jsonStr.getString("affairId"); + if(affairId != null && !"".equals(affairId)){ + NuoNuoEntity nuoNuoEntity = new NuoNuoEntity(); + nuoNuoEntity.setDataSourceCode("SW-OA"); + nuoNuoEntity.setAffairId(affairId); + List nuoNuoEntities = nuoNuoDao.queryAffair(nuoNuoEntity); + if(nuoNuoEntities != null && nuoNuoEntities.size() ==1){ + if(nuoNuoEntities.get(0).getNoname() != null){ + if("确认申请".equals(nuoNuoEntities.get(0).getNoname())){ + return sendNuoNuoFaPiaoQrd(requestJson); + }else if("红字开票".equals(nuoNuoEntities.get(0).getNoname())){ + return sendNuoNuoFaPiaoHc(requestJson); + }else { + return BaseResult.getFailureMessageEntity("节点查找失败"); + } + }else { + return BaseResult.getFailureMessageEntity("节点查找失败"); + + } + }else { + return BaseResult.getFailureMessageEntity("节点查找失败"); + } + }else { + return BaseResult.getFailureMessageEntity("节点查找失败"); } } @@ -311,9 +378,8 @@ public class NuoNuoServiceImpl extends BaseService impleme //sendData.put("invoiceCode",mainData.getString("field0178"));//蓝票发票代码 //可能需要转换 sendData.put("billId",mainData.getString("field0191"));//红字确认单申请单号 - //todo 切换地址 - sendData.put("bizCallbackUrl","http://10.0.2.112:9021/kangarooDataCenterV3/entranceController/nuoNuoHcCallback");//回调地址测试 - //sendData.put("bizCallbackUrl","http://10.0.2.112:9011/kangarooDataCenterV3/entranceController/nuoNuoHcCallback");//回调地址正式 + //sendData.put("bizCallbackUrl","http://10.0.2.112:9021/kangarooDataCenterV3/entranceController/nuoNuoHcCallback");//回调地址测试 + sendData.put("bizCallbackUrl","http://10.0.2.112:9011/kangarooDataCenterV3/entranceController/nuoNuoHcCallback");//回调地址正式 return sendData; } diff --git a/base-buildpackage/src/test/java/com/hzya/frame/temButtom.java b/base-buildpackage/src/test/java/com/hzya/frame/temButtom.java index 8931dde1..93593ade 100644 --- a/base-buildpackage/src/test/java/com/hzya/frame/temButtom.java +++ b/base-buildpackage/src/test/java/com/hzya/frame/temButtom.java @@ -41,6 +41,7 @@ public class temButtom { @Test public void test01() { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date date = null; diff --git a/fw-oa/src/main/java/com/hzya/frame/seeyon/service/impl/NuoNuoCallbackServiceImpl.java b/fw-oa/src/main/java/com/hzya/frame/seeyon/service/impl/NuoNuoCallbackServiceImpl.java index 3118024e..7317a39f 100644 --- a/fw-oa/src/main/java/com/hzya/frame/seeyon/service/impl/NuoNuoCallbackServiceImpl.java +++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/service/impl/NuoNuoCallbackServiceImpl.java @@ -76,7 +76,9 @@ public class NuoNuoCallbackServiceImpl implements INuoNuoCallbackService { String errorMessage = jsonObject.getString("errorMessage");//开票异常信息 String pdfUrl = jsonObject.getString("pdfUrl");//发票pdf地址 - String imageUrl = jsonObject.getString("imageUrl");//发票jpg地址 + String ofdUrl = jsonObject.getString("ofdUrl");//发票jpg地址 + String xmlUrl = jsonObject.getString("xmlUrl");//发票jpg地址 + String invoiceTime = jsonObject.getString("invoiceTime");//开票日期 String invoiceCode = jsonObject.getString("allElectronicInvoiceNumber");//发票代码 String invoiceNumber = jsonObject.getString("invoiceNumber");//发票号码 @@ -168,18 +170,18 @@ public class NuoNuoCallbackServiceImpl implements INuoNuoCallbackService { } } - logger.error("诺诺发票回调接口12:"+imageUrl); + logger.error("诺诺发票回调接口12:"+ofdUrl); - if(imageUrl != null){ - logger.error("诺诺发票回调接口13:"+imageUrl); + if(ofdUrl != null){ + logger.error("诺诺发票回调接口13:"+ofdUrl); - String urlData = sendFileUpload(imageUrl); - logger.error("诺诺发票回调接口14:"+imageUrl); + String urlData = sendFileUpload(ofdUrl); + logger.error("诺诺发票回调接口14:"+ofdUrl); if(urlData != null){ //保存关联表 nuoNuoCallbackEntity.setField0153(urluuid);//发票文件 - logger.error("诺诺发票回调接口15:"+imageUrl); + logger.error("诺诺发票回调接口15:"+ofdUrl); try { @@ -190,14 +192,38 @@ public class NuoNuoCallbackServiceImpl implements INuoNuoCallbackService { returnData.put("message","根据订单编号上传附件失败"); return returnData; } - logger.error("诺诺发票回调接口16:"+imageUrl); + logger.error("诺诺发票回调接口16:"+ofdUrl); + + } + } + if(xmlUrl != null){ + logger.error("诺诺发票回调接口13:"+xmlUrl); + + String urlData = sendFileUpload(xmlUrl); + logger.error("诺诺发票回调接口14:"+xmlUrl); + + if(urlData != null){ + //保存关联表 + nuoNuoCallbackEntity.setField0153(urluuid);//发票文件 + logger.error("诺诺发票回调接口15:"+xmlUrl); + + try { + + ctpAttachmentService.saveAttachment(urlData,nuoNuoCallbackEntity.getFieldsum(),urluuid,nuoNuoCallbackEntity.getDataSourceCode()); + } catch (Exception e) { + JSONObject returnData = new JSONObject(); + returnData.put("code","9999"); + returnData.put("message","根据订单编号上传附件失败"); + return returnData; + } + logger.error("诺诺发票回调接口16:"+xmlUrl); } } //修改单据信息 - logger.error("诺诺发票回调接口17:"+imageUrl); + logger.error("诺诺发票回调接口17:"+ofdUrl); nuoNuoCallbackDao.updateNuoNuo(nuoNuoCallbackEntity); - logger.error("诺诺发票回调接口18:"+imageUrl); + logger.error("诺诺发票回调接口18:"+ofdUrl); JSONObject returnData = new JSONObject(); returnData.put("code","0000"); returnData.put("message","业务方接收同步成功"); @@ -407,7 +433,7 @@ public class NuoNuoCallbackServiceImpl implements INuoNuoCallbackService { **/ @Override public JSONObject nuoNuoQrdCallback(JSONObject jsonObject) { - logger.error("诺诺发票回调接口:"+jsonObject.toJSONString()); + logger.error("诺诺发票确认单回调接口:"+jsonObject.toJSONString()); String backType = jsonObject.getString("backType");//回传类型, 1: 红字信息表 2：红字确认单 String billId = jsonObject.getString("billId");//申请单号 String billStatus = jsonObject.getString("billStatus");//确认单状态 @@ -502,21 +528,23 @@ public class NuoNuoCallbackServiceImpl implements INuoNuoCallbackService { String successFlag = jsonObject.getString("successFlag");//True:开票成功；false：开票失败 String errorMessage = jsonObject.getString("errorMessage");//开票异常信息 String pdfUrl = jsonObject.getString("pdfUrl");//发票pdf地址 + String ofdUrl = jsonObject.getString("ofdUrl");//发票jpg地址 + String xmlUrl = jsonObject.getString("xmlUrl");//发票jpg地址 String imageUrl = jsonObject.getString("imageUrl");//发票jpg地址 String invoiceTime = jsonObject.getString("invoiceTime");//开票日期 String invoiceCode = jsonObject.getString("allElectronicInvoiceNumber");//发票代码 String invoiceNumber = jsonObject.getString("invoiceNumber");//发票号码 String invoiceStatus = jsonObject.getString("invoiceStatus");//发票处理结果 - String orderNo = jsonObject.getString("orderNo");//订单编号 + String billId = jsonObject.getString("billId");//订单编号 logger.error("诺诺发票红冲回调接口1:"+invoiceTime); if(invoiceTime != null && !"".equals(invoiceTime)){ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date date = new Date(jsonObject.getLong("invoiceTime")); invoiceTime = sdf.format(date); } - logger.error("诺诺发票红冲回调接口2:"+orderNo); + logger.error("诺诺发票红冲回调接口2:"+billId); - if(orderNo == null || "".equals(orderNo)){ + if(billId == null || "".equals(billId)){ JSONObject returnData = new JSONObject(); returnData.put("code","9999"); returnData.put("message","订单编号不存在"); @@ -546,7 +574,7 @@ public class NuoNuoCallbackServiceImpl implements INuoNuoCallbackService { //查找单据，上传附件 NuoNuoCallbackEntity queryData = new NuoNuoCallbackEntity(); queryData.setDataSourceCode("SW-OA"); - queryData.setField0191(orderNo); + queryData.setField0191(billId); List entityList = nuoNuoCallbackDao.queryOaHcData(queryData); logger.error("诺诺发票红冲回调接口6:"+entityList.size()); @@ -566,7 +594,7 @@ public class NuoNuoCallbackServiceImpl implements INuoNuoCallbackService { NuoNuoCallbackEntity nuoNuoCallbackEntity = entityList.get(0); nuoNuoCallbackEntity.setDataSourceCode("SW-OA"); - nuoNuoCallbackEntity.setField0191(orderNo);//单据号 + nuoNuoCallbackEntity.setField0191(billId);//单据号 nuoNuoCallbackEntity.setField0150(invoiceNumber);//发票号码 nuoNuoCallbackEntity.setField0151(invoiceTime);//开票日期 nuoNuoCallbackEntity.setField0194(invoiceStatus);//红冲状态 @@ -596,37 +624,61 @@ public class NuoNuoCallbackServiceImpl implements INuoNuoCallbackService { if(pdfUrl != null){ String urlData = sendFileUpload(pdfUrl); - logger.error("诺诺发票红冲回调接口9:"+urlData); + logger.error("诺诺发票回调接口9:"+urlData); if(urlData != null){ //保存关联表 nuoNuoCallbackEntity.setField0153(urluuid);//发票文件 - logger.error("诺诺发票红冲回调接口10:"+nuoNuoCallbackEntity.getFieldsum()); + logger.error("诺诺发票回调接口10:"+nuoNuoCallbackEntity.getFieldsum()); try { ctpAttachmentService.saveAttachment(urlData,nuoNuoCallbackEntity.getFieldsum(),urluuid,nuoNuoCallbackEntity.getDataSourceCode()); } catch (Exception e) { - logger.error("诺诺发票红冲回调接口10error"+e.getMessage()); + logger.error("诺诺发票回调接口10error"+e.getMessage()); JSONObject returnData = new JSONObject(); returnData.put("code","9999"); returnData.put("message","根据订单编号上传附件失败"); return returnData; } - logger.error("诺诺发票红冲回调接口11:"+urlData); + logger.error("诺诺发票回调接口11:"+urlData); } } - logger.error("诺诺发票红冲回调接口12:"+imageUrl); + logger.error("诺诺发票回调接口12:"+ofdUrl); - if(imageUrl != null){ - logger.error("诺诺发票红冲回调接口13:"+imageUrl); + if(ofdUrl != null){ + logger.error("诺诺发票回调接口13:"+ofdUrl); - String urlData = sendFileUpload(imageUrl); - logger.error("诺诺发票红冲回调接口14:"+imageUrl); + String urlData = sendFileUpload(ofdUrl); + logger.error("诺诺发票回调接口14:"+ofdUrl); if(urlData != null){ //保存关联表 nuoNuoCallbackEntity.setField0153(urluuid);//发票文件 - logger.error("诺诺发票红冲回调接口15:"+imageUrl); + logger.error("诺诺发票回调接口15:"+ofdUrl); + + try { + + ctpAttachmentService.saveAttachment(urlData,nuoNuoCallbackEntity.getFieldsum(),urluuid,nuoNuoCallbackEntity.getDataSourceCode()); + } catch (Exception e) { + JSONObject returnData = new JSONObject(); + returnData.put("code","9999"); + returnData.put("message","根据订单编号上传附件失败"); + return returnData; + } + logger.error("诺诺发票回调接口16:"+ofdUrl); + + } + } + if(xmlUrl != null){ + logger.error("诺诺发票回调接口13:"+xmlUrl); + + String urlData = sendFileUpload(xmlUrl); + logger.error("诺诺发票回调接口14:"+xmlUrl); + + if(urlData != null){ + //保存关联表 + nuoNuoCallbackEntity.setField0153(urluuid);//发票文件 + logger.error("诺诺发票回调接口15:"+xmlUrl); try { ctpAttachmentService.saveAttachment(urlData,nuoNuoCallbackEntity.getFieldsum(),urluuid,nuoNuoCallbackEntity.getDataSourceCode()); } catch (Exception e) { @@ -635,8 +687,7 @@ public class NuoNuoCallbackServiceImpl implements INuoNuoCallbackService { returnData.put("message","根据订单编号上传附件失败"); return returnData; } - logger.error("诺诺发票红冲回调接口16:"+imageUrl); - + logger.error("诺诺发票回调接口16:"+xmlUrl); } } //修改单据信息