diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/TaxClassCodeService.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/TaxClassCodeService.java index 395dff7a..d4262975 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/TaxClassCodeService.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/TaxClassCodeService.java @@ -28,6 +28,7 @@ public interface TaxClassCodeService { * @return */ TaxClassCodeEntity queryTaxClassCodeFromCache(String spbm); + TaxClassCodeEntity queryTaxClassCodeEntityBySpbm(String spbm); /** * 查询所有商品税编 diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/impl/TaxClassCodeServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/impl/TaxClassCodeServiceImpl.java index cca8e81f..255108ba 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/impl/TaxClassCodeServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/impl/TaxClassCodeServiceImpl.java @@ -73,6 +73,11 @@ public class TaxClassCodeServiceImpl implements TaxClassCodeService { return taxClassCodeEntity; } + @Override + public TaxClassCodeEntity queryTaxClassCodeEntityBySpbm(String spbm) { + return taxClassCodeMapper.queryTaxClassCodeEntityBySpbm(spbm); + } + @Override public List queryAllTaxClassCode() { diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java index 2903685e..8d321508 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java @@ -4,6 +4,8 @@ import cn.hutool.core.util.ObjectUtil; import com.dxhy.base.file.common.ExcelReadContext; import com.dxhy.base.file.exception.ExcelReadException; import com.dxhy.base.file.handle.ExcelReadHandle; +import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity; +import com.dxhy.order.baseservice.module.taxclass.service.TaxClassCodeService; import com.dxhy.order.consumer.modules.taxcodematch.emum.SdenergyTaxCodeMatchEnum; import com.dxhy.order.consumer.modules.taxcodematch.entity.SdenergyTaxCodeMatch; import com.dxhy.order.consumer.modules.taxcodematch.model.dto.SdenergyTaxCodeMatchDTO; @@ -46,6 +48,8 @@ public class SdenergyTaxCodeMatchController { */ @Resource private SdenergyTaxCodeMatchService sdenergyTaxCodeMatchService; + @Resource + private TaxClassCodeService taxClassCodeService; /** * 通过主键查询单条数据 @@ -163,11 +167,14 @@ public class SdenergyTaxCodeMatchController { if(StringUtils.isBlank(ssflbm)){ errorMsgList.add("第" + resultIndex + "行,税收分类编码不能为空"); continue; - } - String ssflmc = taxCodeMatch.getSsflmc(); - if(StringUtils.isBlank(ssflmc)){ - errorMsgList.add("第" + resultIndex + "行,税收分类名称不能为空"); - continue; + }else { + TaxClassCodeEntity entity = taxClassCodeService.queryTaxClassCodeEntityBySpbm(ssflbm); + if(entity != null){ + taxCodeMatch.setSsflmc(entity.getSpjc()); + }else { + errorMsgList.add("第" + resultIndex + "行,税收分类编码有误"); + continue; + } } } if (ObjectUtil.isNotEmpty(errorMsgList)) {