diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/ht/service/impl/FundsAllocationPluginServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/ht/service/impl/FundsAllocationPluginServiceImpl.java index c3467159..3656b389 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/ht/service/impl/FundsAllocationPluginServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/ht/service/impl/FundsAllocationPluginServiceImpl.java @@ -64,7 +64,9 @@ public class FundsAllocationPluginServiceImpl implements IFundsAllocationPluginS String field0061 = formmainData.getString("field0061"); //司库系统批次号 String field0063 = formmainData.getString("field0063"); - if (StrUtil.isNotEmpty(field0061) || StrUtil.isNotEmpty(field0063)){ + //资金归集 + String field0062 = formmainData.getString("field0062"); + if (StrUtil.isNotEmpty(field0061) || StrUtil.isNotEmpty(field0063) || StrUtil.isNotEmpty(field0062)){ //查询审批意见 FundsAllocationEntity fundAllocation = new FundsAllocationEntity(); fundAllocation.setCol_summary_id(summaryId); @@ -110,6 +112,25 @@ public class FundsAllocationPluginServiceImpl implements IFundsAllocationPluginS JSONObject jsonData = new JSONObject(); jsonData.put("data",encrypt); param = jsonData.toJSONString(); + }else if (StrUtil.isNotEmpty(field0062)){ + appId = "800058"; + apiCode = "8000580004"; + //司库 + JSONObject jsonObject = new JSONObject(); + jsonObject.put("batchNo",field0062); + jsonObject.put("reason",fundAllocation.getContent()); + if (ColEventTypeEnum.ONPROCESSFINISHED.getType().equals(eventType)){ + jsonObject.put("status","APPROVED"); + }else if (ColEventTypeEnum.ONSTOP.getType().equals(eventType)){//审批终止 + jsonObject.put("status","REJECTION"); + } + JSONObject objectData = new JSONObject(); + objectData.put("data",jsonObject); + logger.info("资金归集审批回调司库请求参数明文:{}",objectData.toJSONString()); + String encrypt = SM2Util.encrypt(objectData.toJSONString(),publicKey); + JSONObject jsonData = new JSONObject(); + jsonData.put("data",encrypt); + param = jsonData.toJSONString(); } if (StrUtil.isNotEmpty(appId) && StrUtil.isNotEmpty(apiCode) && StrUtil.isNotEmpty(param)){ logger.info("回调有度/司库请求apiCode{},报文:{}",apiCode,param); diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java index b6921683..f95b8047 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java @@ -100,13 +100,12 @@ public class IncomeInvoiceServiceImpl extends BaseService 0){ for (int i = 0; i < datalist.size(); i++) { @@ -272,7 +274,7 @@ public class IncomeInvoiceServiceImpl extends BaseService queryCursor*size){ queryCursor = queryCursor+1; - sendBusinessData(datalist, access_token, queryCursor, dataTime); + sendBusinessData(datalist, access_token, queryCursor, dataTime,taxNo); } if(businessList != null && businessList.size() > 0){ datalist.addAll(businessList);