From 4df83b1a00117f8c7571ec74311440a13140bb2a Mon Sep 17 00:00:00 2001 From: gaorl Date: Wed, 14 Jun 2023 14:50:17 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=90=8C=E6=AD=A5=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E5=BA=93bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 8e43648e..a704e94e 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 @@ -1914,6 +1914,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { CommodityCodeEntity commodityCodeOld = collect.get(itemInfo.getZxbm()); if(commodityCodeOld == null){ commodityCodeEntity.setId(baseService.getGenerateShotKey()); + commodityCodeEntity.setCommodityId(commodityCodeEntity.getId()); commodityCodeEntity.setCreateTime(new Date()); commodityCodeEntity.setUserId(userInfoService.getUser().getUserId() != null ? userInfoService.getUser().getUserId().toString():"sync"); i = commodityMapper.insertCommodity(commodityCodeEntity); @@ -1950,7 +1951,6 @@ public class OrderInfoServiceImpl implements OrderInfoService { private CommodityCodeEntity buildCommodity(OrderItemInfo itemInfo,OrderInfoVo orderInfoVo,Map spbm ) throws Exception{ CommodityCodeEntity comm = new CommodityCodeEntity(); - comm.setCommodityId(comm.getId()); comm.setSortId(0L); comm.setXhfNsrsbh(orderInfoVo.getXhfNsrsbh()); TaxClassCodeEntity taxClassCodeEntity = spbm.get(itemInfo.getSpbm()); @@ -1964,7 +1964,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { comm.setSpsm(taxClassCodeEntity.getSm()); comm.setSpjm(""); String sl = itemInfo.getSl().replace("%", ""); - comm.setSl(format.format(new BigDecimal("1.3").divide(new BigDecimal("100"), 3, RoundingMode.HALF_UP)));//不需要转换% + comm.setSl(format.format(new BigDecimal(sl).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():"");