diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index 0a5b3db2..d0e675be 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -68,6 +68,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; +import java.text.DecimalFormat; import java.util.*; import java.util.stream.Collectors; @@ -179,6 +180,8 @@ public class OrderInfoServiceImpl implements OrderInfoService { @Resource private CommodityMapper commodityMapper; + DecimalFormat format = new DecimalFormat("#.###"); + @Override public PageUtils selectOrderInfo(Map map, List shList, List entList) { return orderProcessService.selectOrderInfo(map, shList, entList); @@ -1936,9 +1939,11 @@ public class OrderInfoServiceImpl implements OrderInfoService { if(items.size() > 0){ orderItemInfoMapper.updateOrderItemId(items); } + if(sb.length() == 0){ + return R.ok(); + } String substring = sb.substring(0, sb.length() - 1) + "税编有误请检查"; - - return sb.length() == 0 ? R.ok() :R.error(substring); + return R.error(substring); } private CommodityCodeEntity buildCommodity(OrderItemInfo itemInfo,OrderInfoVo orderInfoVo,Map spbm ) throws Exception{ @@ -1956,7 +1961,8 @@ public class OrderInfoServiceImpl implements OrderInfoService { comm.setZxbm(StringUtils.isNotBlank(itemInfo.getZxbm())?itemInfo.getZxbm():comm.getId()); comm.setSpsm(taxClassCodeEntity.getSm()); comm.setSpjm(""); - comm.setSl(itemInfo.getSl());//不需要转换% + String sl = itemInfo.getSl().replace("%", ""); + comm.setSl(format.format(new BigDecimal("1.3").divide(new BigDecimal("100"), 3, RoundingMode.HALF_UP)));//不需要转换% comm.setGgxh(StringUtils.isNotBlank(itemInfo.getGgxh())?BaseServiceBeanTransitionUtils.ggxhTransition(itemInfo.getGgxh()):"");//切除40 comm.setXmdw(itemInfo.getXmdw()); comm.setXmdj(StringUtils.isNotBlank(itemInfo.getXmdj())?itemInfo.getXmdj():""); diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java index ada7cb8a..60baf434 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java @@ -1869,10 +1869,15 @@ public class SpecialInvoiceServiceImpl implements SpecialInvoiceService { } //如果同步下来的结果与已有的结果不一致的话 更新最新的审核结果 - if (!responseHzfpsqbsc.getStatus_CODE().equals(specialInvoiceReversal.getStatusCode())) { + if (!responseHzfpsqbsc.getXXBZT().equals(specialInvoiceReversal.getStatusCode())||!responseHzfpsqbsc.getStatus_CODE().equals(specialInvoiceReversal.getStatusCode())) { updateSpecialEntity.setXxbbh(responseHzfpsqbsc.getXxbbh()); - updateSpecialEntity.setStatusCode(responseHzfpsqbsc.getStatus_CODE()); - updateSpecialEntity.setStatusMessage(responseHzfpsqbsc.getStatus_MESSAGE()); + if(StringUtils.isNotBlank(responseHzfpsqbsc.getStatus_CODE())){ + updateSpecialEntity.setStatusCode(responseHzfpsqbsc.getStatus_CODE()); + updateSpecialEntity.setStatusMessage(responseHzfpsqbsc.getStatus_MESSAGE()); + }else{ + updateSpecialEntity.setStatusCode(responseHzfpsqbsc.getXXBZT()); + updateSpecialEntity.setStatusMessage(responseHzfpsqbsc.getZTMX()); + } updateSpecialEntity.setEditorId(operatorId); updateSpecialEntity.setEditorName(operatorName); updateSpecialEntity.setId(specialInvoiceReversal.getId()); diff --git a/order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml b/order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml index 39907ad4..5b18ea24 100644 --- a/order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml +++ b/order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml @@ -320,9 +320,6 @@ tswl = #{item.tswl,jdbcType=VARCHAR}, - - znfm = #{item.znfm,jdbcType=VARCHAR}, - id = #{item.id,jdbcType=VARCHAR}