diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java index b1b1473b..0515c813 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java @@ -582,18 +582,18 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService { item.setSpbm(taxClassCodeEntity.getSpbm()); } -// //优惠政策标识 -// if (StringUtils.isBlank(item.getYhzcbs()) && StringUtils.isNotBlank(taxClassCodeEntity.getZzstsgl())) { -// item.setYhzcbs(ConfigureConstant.STRING_1); -// } -// //零税率标识 -// if (StringUtils.isBlank(item.getLslbs()) && StringUtils.isNotBlank(commodity.getLslbs())) { -// item.setLslbs(commodity.getLslbs()); -// } -// //增值税特殊管理 -// if (StringUtils.isBlank(item.getZzstsgl()) && StringUtils.isNotBlank(commodity.getZzstsgl())) { -// item.setZzstsgl(commodity.getZzstsgl()); -// } + //优惠政策标识 + if (StringUtils.isBlank(item.getYhzcbs())) { + item.setYhzcbs(ConfigureConstant.STRING_0); + } + //零税率标识 + if (StringUtils.isBlank(item.getLslbs())) { + item.setLslbs(""); + } + //增值税特殊管理 + if (StringUtils.isBlank(item.getZzstsgl())) { + item.setZzstsgl(""); + } //如果项目名称为空,使用底层返回数据进行补全,如果不为空,并且需要补全,则进行补全 String spmc = item.getXmmc(); @@ -720,6 +720,8 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService { //优惠政策标识 if (StringUtils.isBlank(item.getYhzcbs()) && StringUtils.isNotBlank(commodity.getYhzcbs())) { item.setYhzcbs(commodity.getYhzcbs()); + }else if(StringUtils.isBlank(item.getYhzcbs()) && StringUtils.isBlank(commodity.getYhzcbs())){ + item.setYhzcbs(ConfigureConstant.STRING_0); } //零税率标识 @@ -736,7 +738,11 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService { String spmc = item.getXmmc(); StringBuilder stringBuilder = new StringBuilder(); if (StringUtils.isBlank(spmc)) { - spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getXmmc()).toString(); + if(StrUtil.isNotBlank(commodity.getInvoiceName())){ + spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getInvoiceName()).toString(); + }else{ + spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getXmmc()).toString(); + } } else if (StringUtil.checkStr(spmc, commodity.getSpjc())) { spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(spmc).toString(); } diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml index d02d3e70..cd2031ae 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml @@ -42,6 +42,7 @@ + @@ -91,7 +92,8 @@ cc.wlflbm, cc.wlflmc, cc.ent_id, - cc.tswl + cc.tswl, + cc.invoice_name FROM commodity_code cc LEFT JOIN group_commodity gc ON gc.id = cc.group_id