diff --git a/crm/src/main/java/com/kakarote/crm/constant/CrmTaxServiceIdEnum.java b/crm/src/main/java/com/kakarote/crm/constant/CrmTaxServiceIdEnum.java new file mode 100644 index 0000000..530cecf --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/constant/CrmTaxServiceIdEnum.java @@ -0,0 +1,26 @@ +package com.kakarote.crm.constant; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 税务接口服务ID + */ +@Getter +@AllArgsConstructor +public enum CrmTaxServiceIdEnum { + + TAX_AUTHORITY_QUERY("JXSW.DZSWJ.CSXT.CXSWJG","税务机关查询服务"), + ENTERPRISE_CREDIT_RATING("JXSW.DZSWJ.CSXT.QYXYDJCX", "企业信用等级查询"), + ENTERPRISE_RISK_DETAIL("JXSW.DZSWJ.CSXT.QYTSFXMXCX", "查询企业推送风险明细"), + TAXPAYER_QUALIFICATION_CODE("JXSW.DZSWJ.CSXT.NSRZGRDXXCX", "查询纳税人资格代码列表"), + ENTERPRISE_INSURED_COUNT("JXSW.DZSWJ.CSXT.QYCBRSCX", "查询企业参保人数"), + ENTERPRISE_INCOME_TAX_ANNUAL("JXSW.DZSWJ.CSXT.QYSDSNDSBXXCX", "查询企业所得税年度申报信息"), + THREE_YEAR_INVOICE_SUMMARY("JXSW.DZSWJ.CSXT.CXFPHZXX", "查询近三年发票汇总"), + ; + + private final String id; + + private final String description; + +} diff --git a/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncSwjgDTO.java b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncSwjgDTO.java index 6abf73c..e109207 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncSwjgDTO.java +++ b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncSwjgDTO.java @@ -24,7 +24,6 @@ public class CrmSyncSwjgDTO implements Serializable { public String toString() { return "{" + "swjgdm:'" + swjgdm + '\'' + - ", sjswjgdm:'" + sjswjgdm + '\'' + '}'; } } diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmNsrzgServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmNsrzgServiceImpl.java index c7a87c5..6bbf8ee 100644 --- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmNsrzgServiceImpl.java +++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmNsrzgServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.core.type.TypeReference; import com.kakarote.core.security.EncryptionService; import com.kakarote.core.servlet.BaseServiceImpl; +import com.kakarote.crm.constant.CrmTaxServiceIdEnum; import com.kakarote.crm.entity.DTO.CrmSyncNsrzgDTO; import com.kakarote.crm.entity.DTO.CrmWebServiceResponseDTO; import com.kakarote.crm.entity.PO.CrmNsrzg; @@ -13,6 +14,7 @@ import com.kakarote.crm.mapper.CrmQyjbxxMapper; import com.kakarote.crm.service.ICrmNsrzgService; import com.kakarote.crm.util.AecUtils; import com.kakarote.crm.util.JsonUtil; +import com.kakarote.crm.util.WebServiceHandlerUtil; import com.kakarote.crm.webService.config.TaxWebServiceConfig; import com.kakarote.crm.webService.entity.Body; import com.kakarote.crm.webService.util.WebServiceUtil; @@ -101,28 +103,16 @@ public class CrmNsrzgServiceImpl extends BaseServiceImpl syncDataByDjxh(CrmSyncNsrzgDTO crmSyncNsrzgDTO) throws Exception { - Body object = new Body(); - object.setSid("JXSW.DZSWJ.CSXT.NSRZGRDXXCX"); - object.setParams(crmSyncNsrzgDTO.toString()); + String respJson = WebServiceHandlerUtil.connect( + CrmTaxServiceIdEnum.TAXPAYER_QUALIFICATION_CODE.getId(), + crmSyncNsrzgDTO.toString(), + config + ); - String sid = object.getSid (); - System.out.println("config:"+config.getEtaxServiceUrl()); - System.out.println("config:"+config.getAecEncryptKey()); - String requestXml = WebServiceUtil.createRequestXml (sid, object.getParams (), config); - - System.out.println ("requestXml = " + requestXml); - - String response = WebServiceUtil.getEtaxService (config).doService (sid, requestXml); - - System.out.println ("response = " + response); - - XmlService service = WebServiceUtil.getResponse (response); - - String respJson = AecUtils.decrypt (service.getBody (), config.getAecEncryptKey ()); - - System.out.println ("respJson = " + respJson); - - CrmWebServiceResponseDTO> dto = JsonUtil.toObject(respJson, new TypeReference>>() {}); + CrmWebServiceResponseDTO> dto = JsonUtil.toObject( + respJson, + new TypeReference>>() {} + ); List crmNsrzgList = dto.getData(); diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQycbrsServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQycbrsServiceImpl.java index a45a3c0..585d34d 100644 --- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQycbrsServiceImpl.java +++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQycbrsServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.core.type.TypeReference; import com.kakarote.core.servlet.BaseServiceImpl; +import com.kakarote.crm.constant.CrmTaxServiceIdEnum; import com.kakarote.crm.entity.DTO.CrmSyncQycbrsDTO; import com.kakarote.crm.entity.DTO.CrmWebServiceResponseDTO; import com.kakarote.crm.entity.PO.CrmQycbrs; @@ -14,6 +15,7 @@ import com.kakarote.crm.mapper.CrmQyjbxxMapper; import com.kakarote.crm.service.ICrmQycbrsService; import com.kakarote.crm.util.AecUtils; import com.kakarote.crm.util.JsonUtil; +import com.kakarote.crm.util.WebServiceHandlerUtil; import com.kakarote.crm.webService.config.TaxWebServiceConfig; import com.kakarote.crm.webService.entity.Body; import com.kakarote.crm.webService.util.WebServiceUtil; @@ -121,26 +123,11 @@ public class CrmQycbrsServiceImpl extends BaseServiceImpl syncDataByDjxhAndYf(CrmSyncQycbrsDTO crmSyncQycbrsDTO) throws Exception { - Body object = new Body(); - object.setSid("JXSW.DZSWJ.CSXT.QYCBRSCX"); - object.setParams(crmSyncQycbrsDTO.toString()); - - String sid = object.getSid (); - System.out.println("config:"+config.getEtaxServiceUrl()); - System.out.println("config:"+config.getAecEncryptKey()); - String requestXml = WebServiceUtil.createRequestXml (sid, object.getParams (), config); - - System.out.println ("requestXml = " + requestXml); - - String response = WebServiceUtil.getEtaxService (config).doService (sid, requestXml); - - System.out.println ("response = " + response); - - XmlService service = WebServiceUtil.getResponse (response); - - String respJson = AecUtils.decrypt (service.getBody (), config.getAecEncryptKey ()); - - System.out.println ("respJson = " + respJson); + String respJson = WebServiceHandlerUtil.connect( + CrmTaxServiceIdEnum.ENTERPRISE_INSURED_COUNT.getId(), + crmSyncQycbrsDTO.toString(), + config + ); CrmWebServiceResponseDTO> dto = JsonUtil.toObject(respJson, new TypeReference>>() {}); diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyfxmxServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyfxmxServiceImpl.java index 0ad69b9..4cd0058 100644 --- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyfxmxServiceImpl.java +++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyfxmxServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.core.type.TypeReference; import com.kakarote.core.servlet.BaseServiceImpl; +import com.kakarote.crm.constant.CrmTaxServiceIdEnum; import com.kakarote.crm.entity.BO.CrmQueryQyfxmxBO; import com.kakarote.crm.entity.DTO.CrmSyncQyfxmxDTO; import com.kakarote.crm.entity.DTO.CrmWebServiceResponseDTO; @@ -17,6 +18,7 @@ import com.kakarote.crm.mapper.CrmQyjbxxMapper; import com.kakarote.crm.service.ICrmQyfxmxService; import com.kakarote.crm.util.AecUtils; import com.kakarote.crm.util.JsonUtil; +import com.kakarote.crm.util.WebServiceHandlerUtil; import com.kakarote.crm.webService.config.TaxWebServiceConfig; import com.kakarote.crm.webService.entity.Body; import com.kakarote.crm.webService.util.WebServiceUtil; @@ -122,9 +124,6 @@ public class CrmQyfxmxServiceImpl extends BaseServiceImpl syncDataByDjxhAndPjnd(CrmSyncQyfxmxDTO crmSyncQyfxmxDTO) throws Exception { - Body object = new Body(); - object.setSid("JXSW.DZSWJ.CSXT.QYTSFXMXCX"); - String year = crmSyncQyfxmxDTO.getPjnd(); DateTime fxscsjq = DateUtil.beginOfYear(DateUtil.parse(year + "-01-01")); @@ -136,26 +135,16 @@ public class CrmQyfxmxServiceImpl extends BaseServiceImpl