From a5341020be349ede989e6344a89b2e3d9d269681 Mon Sep 17 00:00:00 2001 From: gongquanlin <1025081659@qq.com> Date: Tue, 14 Feb 2023 11:27:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E7=A8=8E=E6=94=B6?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=BC=96=E7=A0=81=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E5=BE=85=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxclass/dao/GroupTaxClassCodeMapper.java | 34 +- .../taxclass/dao/TaxClassCodeMapper.java | 21 +- .../taxclass/service/TaxClassCodeService.java | 15 +- .../service/impl/TaxClassCodeServiceImpl.java | 30 +- .../mapper/GroupTaxClassCodeMapper.xml | 16 +- .../mybatis/mapper/TaxClassCodeMapper.xml | 21 + .../dxhy/order/constant/ConfigurerInfo.java | 5 + .../order/constant/OrderInfoContentEnum.java | 9 + .../openapi/api/InvoiceRestApiV6.java | 47 +- .../protocol/v4/grouptax/GroupTaxReqBO.java | 28 + .../protocol/v4/grouptax/GroupTaxRespBO.java | 31 + .../openapi/protocol/v6/sdenergy/DATABO.java | 15 + .../protocol/v6/sdenergy/DATAINFOSBO.java | 31 + .../openapi/protocol/v6/sdenergy/ESBBO.java | 15 + .../v6}/sdenergy/MdmGmfxxtbMulticodeBO.java | 2 +- .../MdmGmfxxtbMulticodeValuelistBO.java | 2 +- .../v6}/sdenergy/MdmGmfxxtbReqBO.java | 2 +- .../v6/sdenergy/MdmSyncGroupTaxCodeReqBO.java | 59 + .../v6/sdenergy/MdmSyncGroupTaxCodeResBO.java | 11 + .../v6/sdenergy/SDEnergyMdmBaseBO.java | 16 + .../openapi/service/InterfaceServiceV3.java | 128 +- .../service/impl/InterfaceServiceImplV3.java | 1249 +++++++++-------- 22 files changed, 1125 insertions(+), 662 deletions(-) create mode 100644 order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/grouptax/GroupTaxReqBO.java create mode 100644 order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/grouptax/GroupTaxRespBO.java create mode 100644 order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/DATABO.java create mode 100644 order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/DATAINFOSBO.java create mode 100644 order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/ESBBO.java rename {order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/protocol => order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6}/sdenergy/MdmGmfxxtbMulticodeBO.java (89%) rename {order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/protocol => order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6}/sdenergy/MdmGmfxxtbMulticodeValuelistBO.java (93%) rename {order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/protocol => order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6}/sdenergy/MdmGmfxxtbReqBO.java (98%) create mode 100644 order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmSyncGroupTaxCodeReqBO.java create mode 100644 order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmSyncGroupTaxCodeResBO.java create mode 100644 order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/SDEnergyMdmBaseBO.java diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/GroupTaxClassCodeMapper.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/GroupTaxClassCodeMapper.java index 9e5e0896..f24d9505 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/GroupTaxClassCodeMapper.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/GroupTaxClassCodeMapper.java @@ -13,7 +13,7 @@ import java.util.Map; * @Date:2019/9/17 */ public interface GroupTaxClassCodeMapper { - + /** * 插入 * @@ -21,7 +21,7 @@ public interface GroupTaxClassCodeMapper { * @return */ int insert(GroupTaxClassCodeEntity record); - + /** * 根据id查询 * @@ -29,7 +29,15 @@ public interface GroupTaxClassCodeMapper { * @return */ GroupTaxClassCodeEntity selectGroupTaxClassCode(String id); - + + /** + * 根据税号和商品名称查询商品 + * + * @param id + * @return + */ + GroupTaxClassCodeEntity selectGroupTaxClassCodeByNsrsbhAndCode(@Param("xhf_nsrsbh") String nsrsbh,@Param("encoding") String encoding); + /** * 更新 * @@ -37,7 +45,7 @@ public interface GroupTaxClassCodeMapper { * @return */ int updateByPrimaryKeySelective(GroupTaxClassCodeEntity record); - + /** * 更新 * @@ -45,7 +53,7 @@ public interface GroupTaxClassCodeMapper { * @return */ int updateByPrimaryKey(GroupTaxClassCodeEntity record); - + /** * 集团税编库列表 * @@ -53,7 +61,7 @@ public interface GroupTaxClassCodeMapper { * @return */ List> queryGroupTaxClassCode(Map map); - + /** * 集团税编批量共享数据 * @@ -61,7 +69,7 @@ public interface GroupTaxClassCodeMapper { * @param shareStatus */ void updateTaxClassCodeShareStatus(@Param(value = "taxClassCodeIdArray") String[] taxClassCodeIdArray, @Param(value = "shareStatus") String shareStatus); - + /** * 集团税编批量设置数据为启用 * @@ -69,7 +77,7 @@ public interface GroupTaxClassCodeMapper { * @param dataStatus */ void updateTaxClassCodeDataStatus(@Param(value = "taxClassCodeIdArray") String[] taxClassCodeIdArray, @Param(value = "dataStatus") String dataStatus); - + /** * 查询 * @@ -77,7 +85,7 @@ public interface GroupTaxClassCodeMapper { * @return */ Map selectGroupTaxClassCodeById(@Param(value = "groupTaxClassCodeId") String groupTaxClassCodeId); - + /** * 查询 * @@ -85,7 +93,7 @@ public interface GroupTaxClassCodeMapper { * @return */ List queryTaxClassCodeBySpbmAndSpmc(Map paramMap); - + /** * 查询 * @@ -93,7 +101,7 @@ public interface GroupTaxClassCodeMapper { * @return */ List queryTaxClassCodeBySpbmOrSpmc(Map paramMap); - + /** * 集团商品名称校验 * @@ -101,7 +109,7 @@ public interface GroupTaxClassCodeMapper { * @return */ int selectByName(Map map); - + /** * 集团商品code校验 * @@ -109,7 +117,7 @@ public interface GroupTaxClassCodeMapper { * @return */ int selectByCode(Map map); - + /** * 更新 * diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/TaxClassCodeMapper.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/TaxClassCodeMapper.java index 10781fb3..76b4eaf9 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/TaxClassCodeMapper.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/TaxClassCodeMapper.java @@ -1,6 +1,7 @@ package com.dxhy.order.baseservice.module.taxclass.dao; import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -19,9 +20,12 @@ public interface TaxClassCodeMapper { * @return */ List selectTaxClassCode(Map map); - + + + List selectTaxClassCodeBySpmcOrSm(String queryString); + // warning 以下sql添加redis缓存 修改请注意 - + /** * 判断税收分类编码是否存在 * @@ -29,8 +33,17 @@ public interface TaxClassCodeMapper { * @return */ TaxClassCodeEntity queryTaxClassCodeEntityBySpbm(String spbm); - - + + + /** + * 根据商品名称和描述查找商品分类编码 + * + * @param spmc + * @return + */ + TaxClassCodeEntity queryTaxClassCodeEntityBySpmcOrMs(String spmc); + + /** * 查询所有税编表数据 * 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 6d373205..a82de040 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 @@ -19,7 +19,7 @@ public interface TaxClassCodeService { * @return */ PageUtils queryTaxClassCode(Map map); - + /** * 根据商品编码取缓存数据 * @@ -27,14 +27,23 @@ public interface TaxClassCodeService { * @return */ TaxClassCodeEntity queryTaxClassCodeFromCache(String spbm); - + + /** + * 根据商品名称和描述查找商品分类编码 + * + * @param spmc + * @param ms + * @return + */ + TaxClassCodeEntity queryTaxClassCodeFromCacheBySpmcOrMs(String spmc); + /** * 缓存商品编码数据 * * @return */ boolean cacheTaxClassCode(); - + /** * 清除缓存 * 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 e1adf926..e35a9902 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 @@ -28,15 +28,15 @@ import java.util.Map; @Slf4j @Service public class TaxClassCodeServiceImpl implements TaxClassCodeService { - + private static final Map CACHE_MAP = new HashMap<>(); - + @Resource private TaxClassCodeMapper taxClassCodeMapper; - + @Override public PageUtils queryTaxClassCode(Map paramMap) { - + int pageSize = Integer.parseInt(String.valueOf(paramMap.get(ConfigureConstant.STRING_PAGE_SIZE))); int currPage = Integer.parseInt(String.valueOf(paramMap.get(ConfigureConstant.STRING_CURR_PAGE))); PageHelper.startPage(currPage, pageSize); @@ -51,9 +51,9 @@ public class TaxClassCodeServiceImpl implements TaxClassCodeService { } PageInfo pageInfo = new PageInfo<>(taxClassList); return new PageUtils(pageInfo.getList(), (int) pageInfo.getTotal(), pageInfo.getPageSize(), pageInfo.getPageNum()); - + } - + @Override public TaxClassCodeEntity queryTaxClassCodeFromCache(String spbm) { if (StringUtils.isBlank(spbm)) { @@ -69,10 +69,22 @@ public class TaxClassCodeServiceImpl implements TaxClassCodeService { taxClassCodeEntity = taxClassCodeMapper.queryTaxClassCodeEntityBySpbm(spbm); CACHE_MAP.put(spbm, taxClassCodeEntity); } - + return taxClassCodeEntity; } - + + @Override + public TaxClassCodeEntity queryTaxClassCodeFromCacheBySpmcOrMs(String spmc) { + if (StringUtils.isBlank(spmc)) { + return null; + } + if (StringUtils.isBlank(spmc)) { + return null; + } + + return taxClassCodeMapper.queryTaxClassCodeEntityBySpmcOrMs(spmc); + } + @Override public boolean cacheTaxClassCode() { long t1 = System.currentTimeMillis(); @@ -85,7 +97,7 @@ public class TaxClassCodeServiceImpl implements TaxClassCodeService { } return true; } - + @Override public boolean cleanCacheTaxClassCode() { CACHE_MAP.clear(); diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/GroupTaxClassCodeMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/GroupTaxClassCodeMapper.xml index ffa0d6ef..52e60d5b 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/GroupTaxClassCodeMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/GroupTaxClassCodeMapper.xml @@ -27,7 +27,7 @@ id - , sort_id, xhf_nsrsbh, merchandise_name, encoding, tax_items, brief_code, specification_model, + , sort_id, xhf_nsrsbh, merchandise_name, encoding, tax_items, brief_code, specification_model, metering_unit, unit_price, tax_class_code, tax_classification_name, create_time, dept_id, data_source, matching_state, data_state, share_state, group_id,tax_class_abbreviation,difference_flag,description @@ -37,6 +37,18 @@ from group_tax_class_code where id = #{id,jdbcType=VARCHAR} + + + @@ -392,7 +404,7 @@ SELECT gc.group_name, gctc.* FROM group_tax_class_code gctc - LEFT JOIN group_commodity gc ON gctc.group_id = gc.id + LEFT JOIN group_commodity gc ON gctc.group_id = gc.id where gctc.id = #{groupTaxClassCodeId,jdbcType=VARCHAR} diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml index d58fa87e..cbf2ae81 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml @@ -101,6 +101,13 @@ + + + + +