fix: 商品信息补全修改

release
liufeilong 2 years ago
parent d2bf38070e
commit 3f2ed6db66
  1. 32
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java
  2. 4
      order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml

@ -582,18 +582,18 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
item.setSpbm(taxClassCodeEntity.getSpbm()); item.setSpbm(taxClassCodeEntity.getSpbm());
} }
// //优惠政策标识 //优惠政策标识
// if (StringUtils.isBlank(item.getYhzcbs()) && StringUtils.isNotBlank(taxClassCodeEntity.getZzstsgl())) { if (StringUtils.isBlank(item.getYhzcbs())) {
// item.setYhzcbs(ConfigureConstant.STRING_1); item.setYhzcbs(ConfigureConstant.STRING_0);
// } }
// //零税率标识 //零税率标识
// if (StringUtils.isBlank(item.getLslbs()) && StringUtils.isNotBlank(commodity.getLslbs())) { if (StringUtils.isBlank(item.getLslbs())) {
// item.setLslbs(commodity.getLslbs()); item.setLslbs("");
// } }
// //增值税特殊管理 //增值税特殊管理
// if (StringUtils.isBlank(item.getZzstsgl()) && StringUtils.isNotBlank(commodity.getZzstsgl())) { if (StringUtils.isBlank(item.getZzstsgl())) {
// item.setZzstsgl(commodity.getZzstsgl()); item.setZzstsgl("");
// } }
//如果项目名称为空,使用底层返回数据进行补全,如果不为空,并且需要补全,则进行补全 //如果项目名称为空,使用底层返回数据进行补全,如果不为空,并且需要补全,则进行补全
String spmc = item.getXmmc(); String spmc = item.getXmmc();
@ -720,6 +720,8 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
//优惠政策标识 //优惠政策标识
if (StringUtils.isBlank(item.getYhzcbs()) && StringUtils.isNotBlank(commodity.getYhzcbs())) { if (StringUtils.isBlank(item.getYhzcbs()) && StringUtils.isNotBlank(commodity.getYhzcbs())) {
item.setYhzcbs(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(); String spmc = item.getXmmc();
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
if (StringUtils.isBlank(spmc)) { 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())) { } else if (StringUtil.checkStr(spmc, commodity.getSpjc())) {
spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(spmc).toString(); spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(spmc).toString();
} }

@ -42,6 +42,7 @@
<result column="wlflmc" jdbcType="VARCHAR" property="wlflmc"/> <result column="wlflmc" jdbcType="VARCHAR" property="wlflmc"/>
<result column="ent_id" jdbcType="VARCHAR" property="entId"/> <result column="ent_id" jdbcType="VARCHAR" property="entId"/>
<result column="tswl" jdbcType="VARCHAR" property="tswl"/> <result column="tswl" jdbcType="VARCHAR" property="tswl"/>
<result column="invoice_name" jdbcType="VARCHAR" property="invoiceName"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
@ -91,7 +92,8 @@
cc.wlflbm, cc.wlflbm,
cc.wlflmc, cc.wlflmc,
cc.ent_id, cc.ent_id,
cc.tswl cc.tswl,
cc.invoice_name
FROM commodity_code cc FROM commodity_code cc
LEFT JOIN group_commodity gc LEFT JOIN group_commodity gc
ON gc.id = cc.group_id ON gc.id = cc.group_id

Loading…
Cancel
Save