diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/dao/CommodityMapper.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/dao/CommodityMapper.java index 4f3bf7e9..784e77f3 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/dao/CommodityMapper.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/dao/CommodityMapper.java @@ -53,6 +53,8 @@ public interface CommodityMapper { */ int updateCommodity(@Param("commodityCode") CommodityCodeEntity codeEntity, @Param("shList") List shList); + int updateCommodityByZxbm(@Param("commodityCode") CommodityCodeEntity codeEntity, @Param("map") Map map); + int batchUpdateCommodity(@Param("commodityCode") CommodityCodeEntity codeEntity, @Param("ids") List ids); /** diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java index 7a78412a..baf272eb 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java @@ -639,20 +639,27 @@ public class CommodityServiceImpl implements CommodityService { log.debug("{}校验名称是否存在 参数:{}", LOGGER_MSG, map); List commodityCodeEntityList = commodityMapper.queryProductList(map, null); //R r = commodityService.checkRepeat(commodityCodeCheckQuery, NsrsbhUtils.transShListByNsrsbh(receiveSpxxReq.getXhfNsrsbh()), false); - if(commodityCodeEntityList.isEmpty()){ - //if (ConfigureConstant.STRING_0000.equals(r.get(OrderManagementConstant.CODE))) { - + TaxClassCodeEntity taxClassCodeEntity = taxClassCodeService.queryTaxClassCodeFromCache(receiveSpxxReq.getSpbm()); + CommodityCodeEntity commodityCodeEntity = null; + if (ObjectUtil.isNotEmpty(taxClassCodeEntity)) { + commodityCodeEntity = transCommodityCode(receiveSpxxReq, taxClassCodeEntity); + } + if(commodityCodeEntityList.isEmpty()) { + //if (ConfigureConstant.STRING_0000.equals(r.get(OrderManagementConstant.CODE))) { /** * 从缓存中取税编信息 * */ - TaxClassCodeEntity taxClassCodeEntity = taxClassCodeService.queryTaxClassCodeFromCache(receiveSpxxReq.getSpbm()); - if (ObjectUtil.isNotEmpty(taxClassCodeEntity)) { - CommodityCodeEntity commodityCodeEntity = transCommodityCode(receiveSpxxReq, taxClassCodeEntity); + if (commodityCodeEntity != null){ commodityMapper.insertCommodity(commodityCodeEntity); log.debug("添加成功"); } + }else{ + // TODO 简称、商品编码、规格型号、单位、优惠政策标识、零税率标识 + if (commodityCodeEntity != null){ + commodityMapper.updateCommodityByZxbm(commodityCodeEntity, map); + } } } } diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml index 231ea25b..08a1669c 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml @@ -384,6 +384,61 @@ + + + update commodity_code + + + specification_model = #{commodityCode.ggxh,jdbcType=VARCHAR}, + + + metering_unit = #{commodityCode.xmdw,jdbcType=VARCHAR}, + + + hide_the_logo = #{commodityCode.ycbz,jdbcType=VARCHAR}, + + + preferential_policies_type = #{commodityCode.lslbs,jdbcType=VARCHAR}, + + + enjoy_preferential_policies = #{commodityCode.yhzcbs,jdbcType=VARCHAR}, + + + tax_class_code = #{commodityCode.spbm,jdbcType=VARCHAR}, + + + tax_class_abbreviation = #{commodityCode.spjc,jdbcType=VARCHAR}, + + + zzstsgl = #{commodityCode.zzstsgl,jdbcType=VARCHAR}, + + + modify_time = now(), + + + modify_time = SYSDATE, + + + modify_user_id = #{commodityCode.modifyUserId,jdbcType=CHAR}, + + + + collect_ident = #{commodityCode.collectIdent,jdbcType=VARCHAR}, + + + cpy = #{commodityCode.cpy,jdbcType=VARCHAR}, + + + + + + and encoding = #{map.zxbm,jdbcType=VARCHAR}, + + + and ent_id = #{map.entId,jdbcType=VARCHAR}, + + + update commodity_code