diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/vehicles/controller/VehiclesController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/vehicles/controller/VehiclesController.java index 804c7f07..56fa87f7 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/vehicles/controller/VehiclesController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/vehicles/controller/VehiclesController.java @@ -178,7 +178,7 @@ public class VehiclesController { if (StringUtils.isBlank(vehiclesCodeEntity.getCllx())) { return R.error("车辆类型为空"); } - if (StringUtils.isBlank(vehiclesCodeEntity.getTaxClassCode())) { + if (StringUtils.isBlank(vehiclesCodeEntity.getSpbm())) { return R.error("税收编码为空"); } return R.ok(); diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/vehicles/model/VehiclesCodeEntity.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/vehicles/model/VehiclesCodeEntity.java index fda222cf..26f581c7 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/vehicles/model/VehiclesCodeEntity.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/vehicles/model/VehiclesCodeEntity.java @@ -49,35 +49,37 @@ public class VehiclesCodeEntity implements Serializable { * 税收编码 */ @NotBlank(message = "税收编码 不允许为空") - private String taxClassCode; + private String spbm; /** * 税收简称 */ - private String taxClassAbbreviation; + private String spjc; /** * 税收分类名称 */ - private String taxClassificationName; + private String spmc; /** * 税率 */ - private String taxRate; + private String sl; /** * 产地 */ - private String producingArea; + private String clcd; /** * 生产企业名称 */ - private String producingEnterpriseName; + private String scqymc; /** * 享受优惠政策（0：否，1：是） */ - private String enjoyPreferentialPolicies; + private String yhzcbs; /** - * 优惠政策类型jh：空：非零税率，0:出口零税,1：免税，2：不征税 3:普通零税率 4简易征收(如果是按3%简易征收需要保证税率为0.03) + * 优惠政策类型jh：空：非零税率，0:出口零税,1：免税，2：不征税 3:普通零税率 */ - private String preferentialPoliciesType; + private String lslbs; + + /** * 数据来源(0-集团共享；1-手工创建；2-模板导入；3-采集下级；) */ diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/vehicles/service/impl/VehiclesServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/vehicles/service/impl/VehiclesServiceImpl.java index 44f1bf8a..d9209fdf 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/vehicles/service/impl/VehiclesServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/vehicles/service/impl/VehiclesServiceImpl.java @@ -1,12 +1,5 @@ -package com.dxhy.order.baseservice.module.vehicles.service.impl; +package com.dxhy.base.service.module.vehicles.service.impl; -import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; -import com.dxhy.order.constant.*; -import com.dxhy.order.model.PageUtils; -import com.dxhy.order.model.R; -import com.dxhy.order.utils.CheckParamUtil; -import com.dxhy.order.utils.CommonUtils; -import com.dxhy.order.utils.GbkUtil; import com.dxhy.order.baseservice.module.base.service.BaseService; import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity; import com.dxhy.order.baseservice.module.taxclass.service.TaxClassCodeService; @@ -16,6 +9,12 @@ import com.dxhy.order.baseservice.module.vehicles.model.VehiclesExcel; import com.dxhy.order.baseservice.module.vehicles.protocol.FuzzyQueryVehiclesBO; import com.dxhy.order.baseservice.module.vehicles.protocol.VehiclesCodeBO; import com.dxhy.order.baseservice.module.vehicles.service.VehiclesService; +import com.dxhy.order.constant.*; +import com.dxhy.order.model.PageUtils; +import com.dxhy.order.model.R; +import com.dxhy.order.utils.CheckParamUtil; +import com.dxhy.order.utils.CommonUtils; +import com.dxhy.order.utils.GbkUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -62,8 +61,8 @@ public class VehiclesServiceImpl implements VehiclesService { PageHelper.startPage(vehiclesCodeBo.getCurrPage(), vehiclesCodeBo.getPageSize()); List vehiclesCodeEntities = vehiclesCodeMapper.queryVehicles(vehiclesCodeBo, nsrsbhList); vehiclesCodeEntities.forEach(vehiclesCodeEntity -> { - if (StringUtils.isNotBlank(vehiclesCodeEntity.getTaxRate())) { - vehiclesCodeEntity.setTaxRate(CommonUtils.formatSl(vehiclesCodeEntity.getTaxRate())); + if (StringUtils.isNotBlank(vehiclesCodeEntity.getSl())) { + vehiclesCodeEntity.setSl(CommonUtils.formatSl(vehiclesCodeEntity.getSl())); } }); PageInfo pageInfo = new PageInfo<>(vehiclesCodeEntities); @@ -85,13 +84,13 @@ public class VehiclesServiceImpl implements VehiclesService { //设置主键id vehiclesCodeEntity.setId(baseService.getGenerateShotKey()); } - if (StringUtils.isBlank(vehiclesCodeEntity.getTaxRate())) { + if (StringUtils.isBlank(vehiclesCodeEntity.getSl())) { //税率 默认 - vehiclesCodeEntity.setTaxRate("0.13"); + vehiclesCodeEntity.setSl("0.13"); } if (StringUtils.isBlank(vehiclesCodeEntity.getDataSource())) { //设置数据来源 - vehiclesCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_1.getKey()); + vehiclesCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_1.getKey()); } VehiclesCodeEntity duplicateVehiclesCodeEntity = isDuplicate(vehiclesCodeEntity); if (Objects.isNull(duplicateVehiclesCodeEntity)) { @@ -171,56 +170,56 @@ public class VehiclesServiceImpl implements VehiclesService { //税收分类名称 TaxClassCodeEntity taxClassCodeEntity = taxClassCodeService.queryTaxClassCodeFromCache(vehiclesExcel.getTaxClassCode()); if (Objects.nonNull(taxClassCodeEntity)) { - vehiclesCodeEntity.setTaxClassificationName(taxClassCodeEntity.getSpmc()); + vehiclesCodeEntity.setSpmc(taxClassCodeEntity.getSpmc()); } //税率 - String taxRate = vehiclesCodeEntity.getTaxRate(); + String taxRate = vehiclesCodeEntity.getSl(); if (StringUtils.isNotBlank(taxRate)) { - vehiclesCodeEntity.setTaxRate(CommonUtils.formatSl(taxRate)); + vehiclesCodeEntity.setSl(CommonUtils.formatSl(taxRate)); } //享受优惠政策 - String enjoyPreferentialPolicies = vehiclesCodeEntity.getEnjoyPreferentialPolicies(); + String enjoyPreferentialPolicies = vehiclesCodeEntity.getYhzcbs(); enjoyPreferentialPolicies = StringUtils.isEmpty(enjoyPreferentialPolicies) ? ConfigureConstant.STRING_YHZCBS_F : enjoyPreferentialPolicies; if (ConfigureConstant.STRING_YHZCBS_S.equals(enjoyPreferentialPolicies)) { // '享受优惠政策（1：是，0：否）', - vehiclesCodeEntity.setEnjoyPreferentialPolicies(OrderInfoEnum.YHZCBS_1.getKey()); + vehiclesCodeEntity.setYhzcbs(OrderInfoEnum.YHZCBS_1.getKey()); } else if (ConfigureConstant.STRING_YHZCBS_F.equals(enjoyPreferentialPolicies)) { - vehiclesCodeEntity.setEnjoyPreferentialPolicies(OrderInfoEnum.YHZCBS_0.getKey()); + vehiclesCodeEntity.setYhzcbs(OrderInfoEnum.YHZCBS_0.getKey()); } else { - vehiclesCodeEntity.setEnjoyPreferentialPolicies(OrderInfoEnum.YHZCBS_0.getKey()); + vehiclesCodeEntity.setYhzcbs(OrderInfoEnum.YHZCBS_0.getKey()); } //优惠政策类型 - if (StringUtils.isNotBlank(vehiclesCodeEntity.getEnjoyPreferentialPolicies()) - && OrderInfoEnum.YHZCBS_1.getKey().equals(vehiclesCodeEntity.getEnjoyPreferentialPolicies())) { - String preferentialPoliciesType = vehiclesCodeEntity.getPreferentialPoliciesType(); + if (StringUtils.isNotBlank(vehiclesCodeEntity.getYhzcbs()) + && OrderInfoEnum.YHZCBS_1.getKey().equals(vehiclesCodeEntity.getYhzcbs())) { + String preferentialPoliciesType = vehiclesCodeEntity.getLslbs(); if (StringUtils.isNotBlank(preferentialPoliciesType)) { switch (preferentialPoliciesType) { case "不征税": - vehiclesCodeEntity.setPreferentialPoliciesType(OrderInfoEnum.LSLBS_2.getKey()); + vehiclesCodeEntity.setLslbs(OrderInfoEnum.LSLBS_2.getKey()); break; case "免税": - vehiclesCodeEntity.setPreferentialPoliciesType(OrderInfoEnum.LSLBS_1.getKey()); + vehiclesCodeEntity.setLslbs(OrderInfoEnum.LSLBS_1.getKey()); break; case "出口零税": - vehiclesCodeEntity.setPreferentialPoliciesType(OrderInfoEnum.LSLBS_0.getKey()); + vehiclesCodeEntity.setLslbs(OrderInfoEnum.LSLBS_0.getKey()); break; case "普通零税率": - vehiclesCodeEntity.setPreferentialPoliciesType(OrderInfoEnum.LSLBS_3.getKey()); + vehiclesCodeEntity.setLslbs(OrderInfoEnum.LSLBS_3.getKey()); break; case "非零税率": default: - vehiclesCodeEntity.setPreferentialPoliciesType(""); + vehiclesCodeEntity.setLslbs(""); break; } } else { - vehiclesCodeEntity.setPreferentialPoliciesType(""); + vehiclesCodeEntity.setLslbs(""); } } else { - vehiclesCodeEntity.setPreferentialPoliciesType(""); + vehiclesCodeEntity.setLslbs(""); } //数据来源(0-集团共享；1-手工创建；2-模板导入；3-采集下级；) - vehiclesCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_2.getKey()); + vehiclesCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_2.getKey()); //数据创建时间 vehiclesCodeEntity.setCreateTime(new Date()); //更新时间 @@ -243,7 +242,7 @@ public class VehiclesServiceImpl implements VehiclesService { vehiclesCodeEntityNew.setCllx(vehiclesCodeEntity.getCllx()); vehiclesCodeEntityNew.setClbm(vehiclesCodeEntity.getClbm()); vehiclesCodeEntityNew.setCpxh(vehiclesCodeEntity.getCpxh()); - vehiclesCodeEntityNew.setTaxClassCode(vehiclesCodeEntity.getTaxClassCode()); + vehiclesCodeEntityNew.setSpbm(vehiclesCodeEntity.getSpbm()); return vehiclesCodeMapper.selectCount(vehiclesCodeEntityNew); } diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/VehiclesCodeMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/VehiclesCodeMapper.xml index 9ed82f95..c9863b5b 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/VehiclesCodeMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/VehiclesCodeMapper.xml @@ -50,11 +50,11 @@ - AND cllx LIKE CONCAT(CONCAT('%',#{vehiclesCodeBo.cllx},'%')) + AND cllx LIKE concat('%',REPLACE(REPLACE(#{vehiclesCodeBo.cllx},'%','\%'), '_', '\_'),'%') - AND clbm LIKE CONCAT(CONCAT('%',#{vehiclesCodeBo.clbm},'%')) + AND clbm LIKE concat('%',REPLACE(REPLACE(#{vehiclesCodeBo.clbm},'%','\%'), '_', '\_'),'%') @@ -62,7 +62,8 @@ - AND tax_class_code LIKE CONCAT(CONCAT('%',#{vehiclesCodeBo.taxClassCode},'%')) + AND tax_class_code LIKE concat('%',REPLACE(REPLACE(#{vehiclesCodeBo.taxClassCode},'%','\%'), '_', + '\_'),'%') ORDER BY create_time DESC @@ -96,13 +97,13 @@ AND concat_ws(',',xhf_nsrsbh,xhf_mc,cllx,clbm,cpxh,tax_class_code, tax_classification_name,producing_area,producing_enterprise_name) LIKE - CONCAT(CONCAT('%',#{fuzzyQueryCondition}),'%') + concat('%',REPLACE(REPLACE(#{fuzzyQueryCondition},'%','\%'), '_', '\_'),'%') AND xhf_nsrsbh || ',' || xhf_mc || ',' || cllx ',' || clbm ',' || cpxh ',' || tax_class_code ',' || tax_classification_name ',' || producing_area ',' || producing_enterprise_name LIKE - CONCAT(CONCAT('%',#{fuzzyQueryCondition}),'%') + concat('%',REPLACE(REPLACE(#{fuzzyQueryCondition},'%','\%'), '_', '\_'),'%') @@ -130,28 +131,28 @@ cpxh, - + tax_class_code, - + tax_class_abbreviation, - + tax_classification_name, - + tax_rate, - + producing_area, - + producing_enterprise_name, - + enjoy_preferential_policies, - + preferential_policies_type, @@ -179,29 +180,29 @@ #{cpxh,jdbcType=VARCHAR}, - - #{taxClassCode,jdbcType=VARCHAR}, + + #{spbm,jdbcType=VARCHAR}, - - #{taxClassAbbreviation,jdbcType=VARCHAR}, + + #{spjc,jdbcType=VARCHAR}, - - #{taxClassificationName,jdbcType=VARCHAR}, + + #{spmc,jdbcType=VARCHAR}, - - #{taxRate,jdbcType=VARCHAR}, + + #{sl,jdbcType=VARCHAR}, - - #{producingArea,jdbcType=VARCHAR}, + + #{clcd,jdbcType=VARCHAR}, - - #{producingEnterpriseName,jdbcType=VARCHAR}, + + #{scqymc,jdbcType=VARCHAR}, - - #{enjoyPreferentialPolicies,jdbcType=VARCHAR}, + + #{yhzcbs,jdbcType=VARCHAR}, - - #{preferentialPoliciesType,jdbcType=VARCHAR}, + + #{lslbs,jdbcType=VARCHAR}, #{dataSource,jdbcType=VARCHAR}, @@ -237,29 +238,29 @@ cpxh = #{cpxh,jdbcType=VARCHAR}, - - tax_class_code = #{taxClassCode,jdbcType=VARCHAR}, + + tax_class_code = #{spbm,jdbcType=VARCHAR}, - - tax_class_abbreviation = #{taxClassAbbreviation,jdbcType=VARCHAR}, + + tax_class_abbreviation = #{spjc,jdbcType=VARCHAR}, - - tax_classification_name = #{taxClassificationName,jdbcType=VARCHAR}, + + tax_classification_name = #{spmc,jdbcType=VARCHAR}, - - tax_rate = #{taxRate,jdbcType=VARCHAR}, + + tax_rate = #{sl,jdbcType=VARCHAR}, - - producing_area = #{producingArea,jdbcType=VARCHAR}, + + producing_area = #{clcd,jdbcType=VARCHAR}, - - producing_enterprise_name = #{producingEnterpriseName,jdbcType=VARCHAR}, + + producing_enterprise_name = #{scqymc,jdbcType=VARCHAR}, - - enjoy_preferential_policies = #{enjoyPreferentialPolicies,jdbcType=VARCHAR}, + + enjoy_preferential_policies = #{yhzcbs,jdbcType=VARCHAR}, - - preferential_policies_type = #{preferentialPoliciesType,jdbcType=VARCHAR}, + + preferential_policies_type = #{lslbs,jdbcType=VARCHAR}, data_source = #{dataSource,jdbcType=VARCHAR}, @@ -338,8 +339,8 @@ AND cpxh = #{cpxh,jdbcType=VARCHAR} - - AND tax_class_code = #{taxClassCode,jdbcType=VARCHAR} + + AND tax_class_code = #{spbm,jdbcType=VARCHAR} LIMIT 1 diff --git a/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java b/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java index 0ea950f2..15424f2e 100644 --- a/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java +++ b/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java @@ -1132,17 +1132,16 @@ public class CommonUtils { * @date 2021-09-07 */ public static boolean judgeIsFgTerminalNew(String terminalCode, String fgSkKpShList, String sh) { - boolean isSkQd = true; -// if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(sh)) { -// String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); -// for (String fgSkKp : fgSkKpList) { -// if (sh.equals(fgSkKp)) { -// isSkQd = true; -// break; -// } -// } -// } + if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(sh)) { + String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); + for (String fgSkKp : fgSkKpList) { + if (sh.equals(fgSkKp)) { + return false; + } + } + } + boolean isSkQd = true; return (OrderInfoEnum.TAX_EQUIPMENT_FGBW.getKey().equals(terminalCode) || OrderInfoEnum.TAX_EQUIPMENT_FGHX.getKey().equals(terminalCode) || OrderInfoEnum.TAX_EQUIPMENT_FGUKEY.getKey().equals(terminalCode) || @@ -1158,17 +1157,15 @@ public class CommonUtils { * @date 2021-09-07 */ public static boolean judgeIsFgTerminalOld(String terminalCode, String fgSkKpShList, String sh) { - boolean isSkQd = false; -// if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(sh)) { -// String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); -// for (String fgSkKp : fgSkKpList) { -// if (sh.equals(fgSkKp)) { -// isSkQd = true; -// break; -// } -// } -// } - + if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(sh)) { + String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); + for (String fgSkKp : fgSkKpList) { + if (sh.equals(fgSkKp)) { + return true; + } + } + } + boolean isSkQd = true; return (OrderInfoEnum.TAX_EQUIPMENT_FGBW.getKey().equals(terminalCode) || OrderInfoEnum.TAX_EQUIPMENT_FGHX.getKey().equals(terminalCode) || OrderInfoEnum.TAX_EQUIPMENT_FGUKEY.getKey().equals(terminalCode) || diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java index 58bf9b03..91ad8150 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java @@ -14,7 +14,6 @@ import com.dxhy.order.baseservice.module.vehicles.service.VehiclesService; import com.dxhy.order.baseservice.openapi.protocol.spxx.ReceiveSpxxReq; import com.dxhy.order.constant.OrderInfoContentEnum; import com.dxhy.order.constant.OrderInfoEnum; -import com.dxhy.order.constant.TaxClassCodeEnum; import com.dxhy.order.consumer.modules.order.service.OrderInfoEscService; import com.dxhy.order.consumer.modules.order.service.OrderInfoJdcService; import com.dxhy.order.consumer.modules.order.service.OrderItemInfoService; @@ -188,14 +187,14 @@ public class OrderSaveSpxxHandler implements BaseListener { vehiclesCodeEntity.setCllx(cllx); vehiclesCodeEntity.setClbm(clbm); vehiclesCodeEntity.setCpxh(cpxh); - vehiclesCodeEntity.setTaxClassCode(taxClassCodeEntity.getSpbm()); - vehiclesCodeEntity.setTaxClassAbbreviation(taxClassCodeEntity.getSpjc()); - vehiclesCodeEntity.setTaxClassificationName(taxClassCodeEntity.getSpmc()); - vehiclesCodeEntity.setTaxRate(CommonUtils.formatSl(orderItemInfo.getSl())); - vehiclesCodeEntity.setProducingArea(cd); - vehiclesCodeEntity.setProducingEnterpriseName(scqymc); - vehiclesCodeEntity.setEnjoyPreferentialPolicies(orderItemInfo.getYhzcbs()); - vehiclesCodeEntity.setPreferentialPoliciesType(orderItemInfo.getLslbs()); + vehiclesCodeEntity.setSpbm(taxClassCodeEntity.getSpbm()); + vehiclesCodeEntity.setSpjc(taxClassCodeEntity.getSpjc()); + vehiclesCodeEntity.setSpmc(taxClassCodeEntity.getSpmc()); + vehiclesCodeEntity.setSl(CommonUtils.formatSl(orderItemInfo.getSl())); + vehiclesCodeEntity.setClcd(cd); + vehiclesCodeEntity.setScqymc(scqymc); + vehiclesCodeEntity.setYhzcbs(orderItemInfo.getYhzcbs()); + vehiclesCodeEntity.setLslbs(orderItemInfo.getLslbs()); vehiclesCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_4.getKey()); vehiclesCodeEntity.setCreateTime(new Date()); vehiclesCodeEntity.setModifyTime(new Date()); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/CommonRest.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/CommonRest.java index 0f9c81d9..880f511c 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/CommonRest.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/CommonRest.java @@ -218,7 +218,7 @@ public class CommonRest { if (StringUtils.isNotBlank(xhfNsrsbh) && StringUtils.isNotBlank(jqbh)) { try { //解决方格启动和创建主题之间的延迟，程序睡眠2秒保证订阅的主题已创建 - Thread.sleep(2000); + Thread.sleep(15000); } catch (InterruptedException e) { log.error("{}接收emqx消息后程序自动延迟异常:{}", LOGGER_MSG, e.getMessage()); return R.error("接收emqx消息后程序自动延迟异常"); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java index ca39e845..58fc764f 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java @@ -3021,8 +3021,16 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService { log.info("{}请求税控设备类型为:{}", LOGGER_MSG, terminalCode); FgEnterpriseInfoBo fgEnterpriseInfoBo = new FgEnterpriseInfoBo(); fgEnterpriseInfoBo.setSKSBCODE(terminalCode); - fgEnterpriseInfoBo.setKPFS(CommonUtils.judgeIsFgTerminalNew(terminalCode,fgSkKpShList,sh)? FANGGE_INVOICE_TYPE_1.getKey():FANGGE_INVOICE_TYPE_0.getKey()); - + fgEnterpriseInfoBo.setKPFS(FANGGE_INVOICE_TYPE_1.getKey()); + if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(sh)) { + String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); + for (String fgSkKp : fgSkKpList) { + if (sh.equals(fgSkKp)) { + fgEnterpriseInfoBo.setKPFS(FANGGE_INVOICE_TYPE_0.getKey()); + break; + } + } + } fgOrderResponse.setData(fgEnterpriseInfoBo); } catch (Exception e) { fgOrderResponse.setSTATUS_CODE(OrderInfoContentEnum.INVOICE_STAT_ERROR.getKey()); diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/MqttPushClientNew.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/MqttPushClientNew.java index 7cf2b5f4..0f76854a 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/MqttPushClientNew.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/MqttPushClientNew.java @@ -223,14 +223,15 @@ public class MqttPushClientNew { try { //判断mqttTopic是否被订阅，如果没有订阅，则不发送消息 String emqxReqUrl = String.format(invoiceConfig.configMqttSubscriptions(), clientId); - + log.info("调用emqx地址：{}，topic：{}",emqxReqUrl,topic); String emqxMsg = getEmqxMsg(emqxReqUrl); - + log.info("获取emqx返回的信息：{}",emqxMsg); if (StringUtils.isNotBlank(emqxMsg)) { JSONArray data = JSONObject.parseArray(emqxMsg); for (Object o : data) { JSONObject jsonObject = (JSONObject) o; - if (topic.equals(jsonObject.getString("topic"))) { + String topic1 = jsonObject.getString("topic"); + if (topic.equals(topic1)) { flag = true; break; } diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/fangge/service/impl/FangGeServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/fangge/service/impl/FangGeServiceImpl.java index 82acc73a..a499ab24 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/fangge/service/impl/FangGeServiceImpl.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/fangge/service/impl/FangGeServiceImpl.java @@ -642,7 +642,7 @@ public class FangGeServiceImpl implements FangGeService { public boolean getSubscriptions(String nsrsbh, String jqbh) { //发布消息topic String mqttTopic = String.format(RedisConstant.FG_MQTT_TOPIC_PUB_FANGGE, nsrsbh, jqbh); - String clientId = nsrsbh + ConfigureConstant.STRING_UNDERLINE + jqbh; + String clientId = nsrsbh + "_" + jqbh; return mqttPushClientNew.getSubscriptions(mqttTopic, clientId); }