From 13163d4a32775ba44648a2020966b484fc20d48b Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 9 Jun 2023 14:17:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feature=EF=BC=9A=E7=BA=A2=E5=AD=97=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E4=BF=AE=E6=94=B9=E7=BA=A2=E5=AD=97=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=A1=A8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SpecialInvoiceServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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()); From bfb037cf46e2cbf1834116993a937cd35fbc0b3f Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 9 Jun 2023 15:53:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feature=EF=BC=9A=E5=90=8C=E6=AD=A5=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E5=BA=93=E8=BF=94=E5=9B=9E=E6=8A=A5=E9=94=99=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/OrderInfoServiceImpl.java | 12 +++++++++--- .../resources/mybatis/mapper/OrderItemInfoMapper.xml | 3 --- 2 files changed, 9 insertions(+), 6 deletions(-) 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 612537aa..b148535f 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 @@ -67,6 +67,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; @@ -178,6 +179,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); @@ -1930,9 +1933,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{ @@ -1950,7 +1955,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/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}