From c5a3a3e1259784433f06bdfba2c70a8757908a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= Date: Fri, 15 Dec 2023 09:07:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feature:=E5=88=A0=E9=99=A4=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E4=BA=AC=E4=B8=9C=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- order-management-consumer/pom.xml | 10 +- .../impl/PushInvoiceToJdJosServiceImpl.java | 236 +++++++++--------- 2 files changed, 123 insertions(+), 123 deletions(-) diff --git a/order-management-consumer/pom.xml b/order-management-consumer/pom.xml index d62ea91f..7f87cbdf 100644 --- a/order-management-consumer/pom.xml +++ b/order-management-consumer/pom.xml @@ -466,11 +466,11 @@ - - com.jd - open-api-sdk - 2.2 - + + + + + diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/jdjos/service/impl/PushInvoiceToJdJosServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/jdjos/service/impl/PushInvoiceToJdJosServiceImpl.java index 7e979707..547d77a5 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/jdjos/service/impl/PushInvoiceToJdJosServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/jdjos/service/impl/PushInvoiceToJdJosServiceImpl.java @@ -22,19 +22,19 @@ import com.dxhy.order.consumer.modules.jdjos.utils.ProXml; import com.dxhy.order.invoice.config.InvoiceConfig; import com.dxhy.order.invoice.module.invoice.model.FileDownLoad; import com.dxhy.order.invoice.module.invoice.service.OrderInvoiceInfoService; -import com.jd.open.api.sdk.DefaultJdClient; -import com.jd.open.api.sdk.JdClient; -import com.jd.open.api.sdk.domain.e_invoice.IvcPopEnterpriseJsfService.request.updateStateAndLimitMoney.BushuJiChuVo; -import com.jd.open.api.sdk.domain.e_invoice.IvcPopEnterpriseJsfService.request.updateStateAndLimitMoney.BushuZhuangtaiXianeChangeParm; -import com.jd.open.api.sdk.domain.e_invoice.IvcPopEnterpriseJsfService.request.updateStateAndLimitMoney.XianEVo; -import com.jd.open.api.sdk.domain.e_invoice.IvcPopEnterpriseJsfService.response.updateStateAndLimitMoney.DxCommonData; -import com.jd.open.api.sdk.domain.e_invoice.IvcPopEnterpriseJsfService.response.updateStateAndLimitMoney.DxReturnStateInfo; -import com.jd.open.api.sdk.request.e_invoice.JosReceiveInvoiceStateRequest; -import com.jd.open.api.sdk.request.e_invoice.ReceiveInvoicePdfRequest; -import com.jd.open.api.sdk.request.e_invoice.UpdateStateAndLimitMoneyRequest; -import com.jd.open.api.sdk.response.e_invoice.JosReceiveInvoiceStateResponse; -import com.jd.open.api.sdk.response.e_invoice.ReceiveInvoicePdfResponse; -import com.jd.open.api.sdk.response.e_invoice.UpdateStateAndLimitMoneyResponse; +//import com.jd.open.api.sdk.DefaultJdClient; +//import com.jd.open.api.sdk.JdClient; +//import com.jd.open.api.sdk.domain.e_invoice.IvcPopEnterpriseJsfService.request.updateStateAndLimitMoney.BushuJiChuVo; +//import com.jd.open.api.sdk.domain.e_invoice.IvcPopEnterpriseJsfService.request.updateStateAndLimitMoney.BushuZhuangtaiXianeChangeParm; +//import com.jd.open.api.sdk.domain.e_invoice.IvcPopEnterpriseJsfService.request.updateStateAndLimitMoney.XianEVo; +//import com.jd.open.api.sdk.domain.e_invoice.IvcPopEnterpriseJsfService.response.updateStateAndLimitMoney.DxCommonData; +//import com.jd.open.api.sdk.domain.e_invoice.IvcPopEnterpriseJsfService.response.updateStateAndLimitMoney.DxReturnStateInfo; +//import com.jd.open.api.sdk.request.e_invoice.JosReceiveInvoiceStateRequest; +//import com.jd.open.api.sdk.request.e_invoice.ReceiveInvoicePdfRequest; +//import com.jd.open.api.sdk.request.e_invoice.UpdateStateAndLimitMoneyRequest; +//import com.jd.open.api.sdk.response.e_invoice.JosReceiveInvoiceStateResponse; +//import com.jd.open.api.sdk.response.e_invoice.ReceiveInvoicePdfResponse; +//import com.jd.open.api.sdk.response.e_invoice.UpdateStateAndLimitMoneyResponse; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.joda.time.DateTime; @@ -139,17 +139,17 @@ public class PushInvoiceToJdJosServiceImpl implements PushInvoiceToJdJosService String pushXml = ProXml.makeFirstLayerXml(new JdJosGlobalInfo(), fpjgxx, ConfigurerInfo.ENCRYPTCODE_0); - JdClient client = new DefaultJdClient(openApiConfig.getJdJosUrl(), "", openApiConfig.getJdJosAppKey(), openApiConfig.getJdJosAppSecret()); - ReceiveInvoicePdfRequest request = new ReceiveInvoicePdfRequest(); - log.info("{}推送京东宙斯接口,请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pushXml)); - request.setInvoiceXml(pushXml); - try { - final DateTime begin = DateTime.now(); - ReceiveInvoicePdfResponse response = client.execute(request); - log.info("(pushInvoice)流水号:{},返回报文:{}, 耗时{}毫秒", fpjgxx.getFPQQLSH(), JsonUtils.getInstance().toJsonString(response), new Duration(begin, DateTime.now()).getMillis()); - } catch (Exception e) { - log.error("(pushInvoice)流水号:{},推送京东jos失败，异常信息:{}", fpjgxx.getFPQQLSH(), e); - } +// JdClient client = new DefaultJdClient(openApiConfig.getJdJosUrl(), "", openApiConfig.getJdJosAppKey(), openApiConfig.getJdJosAppSecret()); +// ReceiveInvoicePdfRequest request = new ReceiveInvoicePdfRequest(); +// log.info("{}推送京东宙斯接口,请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(pushXml)); +// request.setInvoiceXml(pushXml); +// try { +// final DateTime begin = DateTime.now(); +// ReceiveInvoicePdfResponse response = client.execute(request); +// log.info("(pushInvoice)流水号:{},返回报文:{}, 耗时{}毫秒", fpjgxx.getFPQQLSH(), JsonUtils.getInstance().toJsonString(response), new Duration(begin, DateTime.now()).getMillis()); +// } catch (Exception e) { +// log.error("(pushInvoice)流水号:{},推送京东jos失败，异常信息:{}", fpjgxx.getFPQQLSH(), e); +// } return R.ok(); } @@ -162,37 +162,37 @@ public class PushInvoiceToJdJosServiceImpl implements PushInvoiceToJdJosService try { - JdClient client = new DefaultJdClient(openApiConfig.getJdJosUrl(), "", openApiConfig.getJdJosAppKey(), openApiConfig.getJdJosAppSecret()); - JosReceiveInvoiceStateRequest josReceiveInvoiceStateRequest = new JosReceiveInvoiceStateRequest(); - josReceiveInvoiceStateRequest.setExpand12(""); - josReceiveInvoiceStateRequest.setExpand1(""); - josReceiveInvoiceStateRequest.setBusinessId(fpFailTsMqData.getDdh()); - josReceiveInvoiceStateRequest.setResultCode(fpFailTsMqData.getDdzt()); - josReceiveInvoiceStateRequest.setReqNo(fpFailTsMqData.getFpqqlsh()); - josReceiveInvoiceStateRequest.setSource(1); - josReceiveInvoiceStateRequest.setResultMessage(fpFailTsMqData.getDdztxx()); - josReceiveInvoiceStateRequest.setTimestamp(DateUtil.now()); - - log.info("{}推送京东宙斯接口,请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(josReceiveInvoiceStateRequest)); - try { - final DateTime begin = DateTime.now(); - JosReceiveInvoiceStateResponse response = client.execute(josReceiveInvoiceStateRequest); - log.info("{}流水号:{},返回报文:{}, 耗时{}毫秒",LOGGER_MSG, fpFailTsMqData.getFpqqlsh(), JsonUtils.getInstance().toJsonString(response), new Duration(begin, DateTime.now()).getMillis()); - if(ObjectUtil.isNotNull(response) && StringUtils.isNotBlank(response.getReturnMsg())){ - - Map map = JsonUtils.getInstance().parseObject(response.getReturnMsg(), Map.class); - if(ConfigureConstant.STRING_0000.equals(map.get(ConfigureConstant.CODE))){ - log.info("{}流水号:{},推送宙斯成功,返回报文:{}",LOGGER_MSG, fpFailTsMqData.getFpqqlsh(), response.getReturnMsg()); - return R.ok(); - }else { - return R.error(map.get("errorMessage")); - } - }else { - return R.error(response.getMsg()); - } - } catch (Exception e) { - log.error("{}流水号:{},推送京东jos失败，异常信息:{}",LOGGER_MSG, fpFailTsMqData.getFpqqlsh(), e); - } +// JdClient client = new DefaultJdClient(openApiConfig.getJdJosUrl(), "", openApiConfig.getJdJosAppKey(), openApiConfig.getJdJosAppSecret()); +// JosReceiveInvoiceStateRequest josReceiveInvoiceStateRequest = new JosReceiveInvoiceStateRequest(); +// josReceiveInvoiceStateRequest.setExpand12(""); +// josReceiveInvoiceStateRequest.setExpand1(""); +// josReceiveInvoiceStateRequest.setBusinessId(fpFailTsMqData.getDdh()); +// josReceiveInvoiceStateRequest.setResultCode(fpFailTsMqData.getDdzt()); +// josReceiveInvoiceStateRequest.setReqNo(fpFailTsMqData.getFpqqlsh()); +// josReceiveInvoiceStateRequest.setSource(1); +// josReceiveInvoiceStateRequest.setResultMessage(fpFailTsMqData.getDdztxx()); +// josReceiveInvoiceStateRequest.setTimestamp(DateUtil.now()); +// +// log.info("{}推送京东宙斯接口,请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(josReceiveInvoiceStateRequest)); +// try { +// final DateTime begin = DateTime.now(); +// JosReceiveInvoiceStateResponse response = client.execute(josReceiveInvoiceStateRequest); +// log.info("{}流水号:{},返回报文:{}, 耗时{}毫秒",LOGGER_MSG, fpFailTsMqData.getFpqqlsh(), JsonUtils.getInstance().toJsonString(response), new Duration(begin, DateTime.now()).getMillis()); +// if(ObjectUtil.isNotNull(response) && StringUtils.isNotBlank(response.getReturnMsg())){ +// +// Map map = JsonUtils.getInstance().parseObject(response.getReturnMsg(), Map.class); +// if(ConfigureConstant.STRING_0000.equals(map.get(ConfigureConstant.CODE))){ +// log.info("{}流水号:{},推送宙斯成功,返回报文:{}",LOGGER_MSG, fpFailTsMqData.getFpqqlsh(), response.getReturnMsg()); +// return R.ok(); +// }else { +// return R.error(map.get("errorMessage")); +// } +// }else { +// return R.error(response.getMsg()); +// } +// } catch (Exception e) { +// log.error("{}流水号:{},推送京东jos失败，异常信息:{}",LOGGER_MSG, fpFailTsMqData.getFpqqlsh(), e); +// } } catch (Exception e) { log.warn("{}推送京东宙斯失败发票数据异常:{}!", LOGGER_MSG,e); @@ -209,69 +209,69 @@ public class PushInvoiceToJdJosServiceImpl implements PushInvoiceToJdJosService try { - JdClient client = new DefaultJdClient(openApiConfig.getJdJosUrl(), "", openApiConfig.getJdJosAppKey(), openApiConfig.getJdJosAppSecret()); - UpdateStateAndLimitMoneyRequest updateStateAndLimitMoneyRequest = new UpdateStateAndLimitMoneyRequest(); - BushuZhuangtaiXianeChangeParm bushuZhuangtaiXianeChangeParm = new BushuZhuangtaiXianeChangeParm(); - bushuZhuangtaiXianeChangeParm.setNSRMC(jdwjMqData.getNSRMC()); - bushuZhuangtaiXianeChangeParm.setBSZT(jdwjMqData.getBSZT()); - bushuZhuangtaiXianeChangeParm.setQYID(jdwjMqData.getQYID()); - bushuZhuangtaiXianeChangeParm.setTSLX(jdwjMqData.getTSLX()); - bushuZhuangtaiXianeChangeParm.setNSRSBH(jdwjMqData.getNSRSBH()); - bushuZhuangtaiXianeChangeParm.setBSZTDM(jdwjMqData.getBSZTDM()); - bushuZhuangtaiXianeChangeParm.setSouceId(jdwjMqData.getSouceId()); - bushuZhuangtaiXianeChangeParm.setType(jdwjMqData.getType()); - - List bushuJiChuVoList = new ArrayList<>(); - if(ObjectUtil.isNotEmpty(jdwjMqData.getSBJCXX())){ - for (SBJCXXDTO sbjcxx : jdwjMqData.getSBJCXX()) { - BushuJiChuVo bushuJiChuVo = new BushuJiChuVo(); - List xianEVoList = new ArrayList<>(); - if(ObjectUtil.isNotEmpty(sbjcxx.getFPLXDMXX())){ - for (FPLXDMXXDTO fplxdmxx : sbjcxx.getFPLXDMXX()) { - XianEVo xianEVo = new XianEVo(); - xianEVo.setFPLXDM(CommonUtils.transFplxdm(fplxdmxx.getFPLXDM())); - xianEVo.setDZKPXE(fplxdmxx.getDZKPXE()); - - xianEVoList.add(xianEVo); - } - } - - bushuJiChuVo.setJQBH(sbjcxx.getJQBH()); - bushuJiChuVo.setFPLXDMXX(xianEVoList); - - bushuJiChuVoList.add(bushuJiChuVo); - } - - } - - - bushuZhuangtaiXianeChangeParm.setSBJCXX(bushuJiChuVoList); - - updateStateAndLimitMoneyRequest.setParam1(bushuZhuangtaiXianeChangeParm); - - log.info("{}推送京东宙斯部署状态数据接口,请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(updateStateAndLimitMoneyRequest)); - try { - final DateTime begin = DateTime.now(); - UpdateStateAndLimitMoneyResponse response = client.execute(updateStateAndLimitMoneyRequest); - log.info("{}推送京东宙斯部署状态数据接口,返回报文:{}, 耗时{}毫秒",LOGGER_MSG, JsonUtils.getInstance().toJsonString(response), new Duration(begin, DateTime.now()).getMillis()); - - if(ObjectUtil.isNotNull(response)){ - DxCommonData returnType = response.getReturnType(); - if(ObjectUtil.isNotNull(returnType)){ - DxReturnStateInfo returnStateInfo = returnType.getReturnStateInfo(); - if(ObjectUtil.isNotNull(returnStateInfo)){ - if(ConfigureConstant.STRING_000000.equals(returnStateInfo.getReturnCode())){ - return R.error(returnStateInfo.getReturnCode(),returnStateInfo.getReturnMessage()); - }else { - return R.error(returnStateInfo.getReturnCode(),returnStateInfo.getReturnMessage()); - } - } - } - } - - } catch (Exception e) { - log.error("{}推送京东宙斯部署状态数据接口,推送京东jos失败，异常信息:{}",LOGGER_MSG, e); - } +// JdClient client = new DefaultJdClient(openApiConfig.getJdJosUrl(), "", openApiConfig.getJdJosAppKey(), openApiConfig.getJdJosAppSecret()); +// UpdateStateAndLimitMoneyRequest updateStateAndLimitMoneyRequest = new UpdateStateAndLimitMoneyRequest(); +// BushuZhuangtaiXianeChangeParm bushuZhuangtaiXianeChangeParm = new BushuZhuangtaiXianeChangeParm(); +// bushuZhuangtaiXianeChangeParm.setNSRMC(jdwjMqData.getNSRMC()); +// bushuZhuangtaiXianeChangeParm.setBSZT(jdwjMqData.getBSZT()); +// bushuZhuangtaiXianeChangeParm.setQYID(jdwjMqData.getQYID()); +// bushuZhuangtaiXianeChangeParm.setTSLX(jdwjMqData.getTSLX()); +// bushuZhuangtaiXianeChangeParm.setNSRSBH(jdwjMqData.getNSRSBH()); +// bushuZhuangtaiXianeChangeParm.setBSZTDM(jdwjMqData.getBSZTDM()); +// bushuZhuangtaiXianeChangeParm.setSouceId(jdwjMqData.getSouceId()); +// bushuZhuangtaiXianeChangeParm.setType(jdwjMqData.getType()); +// +// List bushuJiChuVoList = new ArrayList<>(); +// if(ObjectUtil.isNotEmpty(jdwjMqData.getSBJCXX())){ +// for (SBJCXXDTO sbjcxx : jdwjMqData.getSBJCXX()) { +// BushuJiChuVo bushuJiChuVo = new BushuJiChuVo(); +// List xianEVoList = new ArrayList<>(); +// if(ObjectUtil.isNotEmpty(sbjcxx.getFPLXDMXX())){ +// for (FPLXDMXXDTO fplxdmxx : sbjcxx.getFPLXDMXX()) { +// XianEVo xianEVo = new XianEVo(); +// xianEVo.setFPLXDM(CommonUtils.transFplxdm(fplxdmxx.getFPLXDM())); +// xianEVo.setDZKPXE(fplxdmxx.getDZKPXE()); +// +// xianEVoList.add(xianEVo); +// } +// } +// +// bushuJiChuVo.setJQBH(sbjcxx.getJQBH()); +// bushuJiChuVo.setFPLXDMXX(xianEVoList); +// +// bushuJiChuVoList.add(bushuJiChuVo); +// } +// +// } +// +// +// bushuZhuangtaiXianeChangeParm.setSBJCXX(bushuJiChuVoList); +// +// updateStateAndLimitMoneyRequest.setParam1(bushuZhuangtaiXianeChangeParm); +// +// log.info("{}推送京东宙斯部署状态数据接口,请求参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(updateStateAndLimitMoneyRequest)); +// try { +// final DateTime begin = DateTime.now(); +// UpdateStateAndLimitMoneyResponse response = client.execute(updateStateAndLimitMoneyRequest); +// log.info("{}推送京东宙斯部署状态数据接口,返回报文:{}, 耗时{}毫秒",LOGGER_MSG, JsonUtils.getInstance().toJsonString(response), new Duration(begin, DateTime.now()).getMillis()); +// +// if(ObjectUtil.isNotNull(response)){ +// DxCommonData returnType = response.getReturnType(); +// if(ObjectUtil.isNotNull(returnType)){ +// DxReturnStateInfo returnStateInfo = returnType.getReturnStateInfo(); +// if(ObjectUtil.isNotNull(returnStateInfo)){ +// if(ConfigureConstant.STRING_000000.equals(returnStateInfo.getReturnCode())){ +// return R.error(returnStateInfo.getReturnCode(),returnStateInfo.getReturnMessage()); +// }else { +// return R.error(returnStateInfo.getReturnCode(),returnStateInfo.getReturnMessage()); +// } +// } +// } +// } +// +// } catch (Exception e) { +// log.error("{}推送京东宙斯部署状态数据接口,推送京东jos失败，异常信息:{}",LOGGER_MSG, e); +// } } catch (Exception e) { log.warn("{}推送京东宙斯部署状态数据接口,异常:{}!", LOGGER_MSG,e); From ca8a12abd21bec259ab910f6e372ca0e3ca4f469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= Date: Sat, 16 Dec 2023 09:30:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feature=EF=BC=9A=E5=8E=BB=E9=99=A4aisinouti?= =?UTF-8?q?ls?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- order-management-consumer/pom.xml | 10 ++--- .../consumer/modules/bigdata/util/ProXml.java | 30 +++++++-------- .../consumer/modules/jdjos/utils/ProXml.java | 30 +++++++-------- .../service/impl/HomeBoardServiceImpl.java | 38 +++++++++---------- 4 files changed, 54 insertions(+), 54 deletions(-) diff --git a/order-management-consumer/pom.xml b/order-management-consumer/pom.xml index 7f87cbdf..3198dd78 100644 --- a/order-management-consumer/pom.xml +++ b/order-management-consumer/pom.xml @@ -480,11 +480,11 @@ - - com.aisino - aisinoutils - 1.0 - + + + + + diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/bigdata/util/ProXml.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/bigdata/util/ProXml.java index 9dcfaad1..c426c549 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/bigdata/util/ProXml.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/bigdata/util/ProXml.java @@ -10,7 +10,7 @@ package com.dxhy.order.consumer.modules.bigdata.util; -import com.aisino.common.util.XMLShellFactory; +//import com.aisino.common.util.XMLShellFactory; import com.dxhy.order.constant.ConfigureConstant; import com.dxhy.order.utils.Base64Encoding; import com.dxhy.order.utils.GbkUtil; @@ -214,7 +214,7 @@ public class ProXml { public static String makeFirstLayerXml(BigDataGlobalInfo glo, Object reqObj, String encryptCode) { BigDataReturnStateInfo rs = ProXml.getReturnStateInfo(XmlPar.BUSI_SSUCCESS, ""); ByteArrayOutputStream out = new ByteArrayOutputStream(); - XMLShellFactory.newInstance().saveXml(out, reqObj); +// XMLShellFactory.newInstance().saveXml(out, reqObj); BigDataData data = ProXml.getData(out, encryptCode, false); return ProXml.getXml(glo, rs, data); } @@ -266,25 +266,25 @@ public class ProXml { /** *

获取二层协议中的协议对象

* - * @param xml + * @param * @return * @throws Exception List * @author: jerome.wang * @date: Created on 2016-5-11 下午02:33:25 */ @SuppressWarnings("AlibabaUndefineMagicConstant") - public static List getDataRoot(String xml) throws Exception { - String xmlRootStart = " "; - String xmlRootEnd = ""; - if (xml.startsWith(" "; +// String xmlRootEnd = ""; +// if (xml.startsWith("获取一层协议的data对象

diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/jdjos/utils/ProXml.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/jdjos/utils/ProXml.java index f5916671..158f10d3 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/jdjos/utils/ProXml.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/jdjos/utils/ProXml.java @@ -10,7 +10,7 @@ package com.dxhy.order.consumer.modules.jdjos.utils; -import com.aisino.common.util.XMLShellFactory; +//import com.aisino.common.util.XMLShellFactory; import com.dxhy.order.constant.ConfigureConstant; import com.dxhy.order.utils.Base64Encoding; import com.dxhy.order.utils.GbkUtil; @@ -214,7 +214,7 @@ public class ProXml { public static String makeFirstLayerXml(JdJosGlobalInfo glo, Object reqObj, String encryptCode) { JdJosReturnStateInfo rs = ProXml.getReturnStateInfo(XmlPar.BUSI_SSUCCESS, ""); ByteArrayOutputStream out = new ByteArrayOutputStream(); - XMLShellFactory.newInstance().saveXml(out, reqObj); + //XMLShellFactory.newInstance().saveXml(out, reqObj); JdJosData data = ProXml.getData(out, encryptCode, false); return ProXml.getXml(glo, rs, data); } @@ -266,25 +266,25 @@ public class ProXml { /** *

获取二层协议中的协议对象

* - * @param xml + * @param * @return * @throws Exception List * @author: jerome.wang * @date: Created on 2016-5-11 下午02:33:25 */ @SuppressWarnings("AlibabaUndefineMagicConstant") - public static List getDataRoot(String xml) throws Exception { - String xmlRootStart = " "; - String xmlRootEnd = ""; - if (xml.startsWith(" "; +// String xmlRootEnd = ""; +// if (xml.startsWith("获取一层协议的data对象

diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/HomeBoardServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/HomeBoardServiceImpl.java index e87da614..80c0bd1e 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/HomeBoardServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/HomeBoardServiceImpl.java @@ -157,37 +157,37 @@ public class HomeBoardServiceImpl implements HomeBoardService { String currDateStr = DateUtil.format(currDate, ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S); if (StringUtils.equals(ConfigureConstant.STRING_0, queryType)) { //本月开票数据 - DateTime beginOfMonth = DateUtil.beginOfMonth(currDate); - String beginOfMonthStr = DateUtil.formatDateTime(beginOfMonth); - startTime = com.aisino.common.util.DateUtil.parse(beginOfMonthStr, - ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S); - endTime = com.aisino.common.util.DateUtil.parse(currDateStr, - ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S); +// DateTime beginOfMonth = DateUtil.beginOfMonth(currDate); +// String beginOfMonthStr = DateUtil.formatDateTime(beginOfMonth); +// startTime = com.aisino.common.util.DateUtil.parse(beginOfMonthStr, +// ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S); +// endTime = com.aisino.common.util.DateUtil.parse(currDateStr, +// ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S); } else if (StringUtils.equals(ConfigureConstant.STRING_1, queryType)) { //本季度开票数据 DateTime beginOfQuarter = DateUtil.beginOfQuarter(currDate); String beginOfQuarterStr = DateUtil.formatDateTime(beginOfQuarter); - startTime = com.aisino.common.util.DateUtil.parse(beginOfQuarterStr, - ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S); - endTime = com.aisino.common.util.DateUtil.parse(currDateStr, - ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S); +// startTime = com.aisino.common.util.DateUtil.parse(beginOfQuarterStr, +// ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S); +// endTime = com.aisino.common.util.DateUtil.parse(currDateStr, +// ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S); } else if (StringUtils.equals(ConfigureConstant.STRING_2, queryType)) { //累计开票数据 - endTime = com.aisino.common.util.DateUtil.parse(currDateStr, - ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S); +// endTime = com.aisino.common.util.DateUtil.parse(currDateStr, +// ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S); } else { throw new OrderReceiveException(ConfigureConstant.STRING_9999, "查询类型不合法，只能是0:本月,1:本季度,2:累计"); } List shList = Lists.newArrayList(kpsjBO.getNsrsbh()); List entList = Lists.newArrayList(kpsjBO.getEntId()); KpsjVO kpsjVO = new KpsjVO(); - InvoiceCount invoiceCount = invoiceCountService.countInvoiceInfoByTime(startTime, endTime, shList, entList); - if (Objects.isNull(invoiceCount)) { - throw new OrderReceiveException(ConfigureConstant.STRING_9999, "未查询到相关开票数据!"); - } - kpsjVO.setKpl(Integer.parseInt(invoiceCount.getCount())); - kpsjVO.setHjje(invoiceCount.getHjje()); - kpsjVO.setHjse(invoiceCount.getHjse()); +// InvoiceCount invoiceCount = invoiceCountService.countInvoiceInfoByTime(startTime, endTime, shList, entList); +// if (Objects.isNull(invoiceCount)) { +// throw new OrderReceiveException(ConfigureConstant.STRING_9999, "未查询到相关开票数据!"); +// } +// kpsjVO.setKpl(Integer.parseInt(invoiceCount.getCount())); +// kpsjVO.setHjje(invoiceCount.getHjje()); +// kpsjVO.setHjse(invoiceCount.getHjse()); return kpsjVO; }