From 21e83181fb19917a62a095bbf21d6c00d4850d61 Mon Sep 17 00:00:00 2001 From: gaorl Date: Sun, 25 Jun 2023 17:08:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feature=EF=BC=9A=E6=98=8E=E7=BB=86=E8=A1=8C?= =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 43135e57..4b0f502f 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 @@ -2027,7 +2027,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { } List collect = null; if(itemList != null){ - collect = orderItemInfos.stream().filter(t -> itemList.contains(t.getId()) && StringUtils.isBlank(t.getSpbm())).collect(Collectors.toList()); + collect = orderItemInfos.stream().filter(t -> itemList.contains(t.getId()) && StringUtils.isNotBlank(t.getSpbm())).collect(Collectors.toList()); if(ObjectUtil.isNull(collect)){ return R.error("税收编码为空的不允许合并,请先更新税收编码"); } From 080a848a7110551740887a0f3cb0cb6fd49e46ad Mon Sep 17 00:00:00 2001 From: gaorl Date: Sun, 25 Jun 2023 19:39:10 +0800 Subject: [PATCH 2/3] =?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=E6=97=B6=EF=BC=8C=E4=B8=8D=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=8D=95=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 1 - 1 file changed, 1 deletion(-) 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 4b0f502f..dca09f63 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 @@ -1994,7 +1994,6 @@ public class OrderInfoServiceImpl implements OrderInfoService { 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():""); comm.setHsbz(itemInfo.getHsbz()); comm.setYcbz(ConfigureConstant.STRING_0); comm.setYhzcbs(itemInfo.getYhzcbs()); From 3fbf33192d1f4d79f6aa3fd61fe7e1eea470ec01 Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 26 Jun 2023 11:55:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feature=EF=BC=9A=E5=9B=9E=E6=8E=A8SAP?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=98=8E=E7=BB=86=E8=A1=8C=E6=90=BA=E5=B8=A6?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PushInvoiceServiceImpl.java | 6 +--- .../service/impl/OrderInfoServiceImpl.java | 30 +++++++++++++------ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index b8fa00a2..347fc040 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -1368,11 +1368,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { ddmxxx.stream().forEach(f -> { FpkjtsMxSap detail = new FpkjtsMxSap(); //主信息 - if(OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(orderProcessInfo.getXtly())){ - detail.setZJSDH(orderProcessInfo.getOriginDdh()); - }else { - detail.setZJSDH(""); - } + detail.setZJSDH(StringUtils.isNotBlank(orderProcessInfo.getOriginDdh())?orderProcessInfo.getOriginDdh():orderProcessInfo.getDdh()); // detail.setZJSDH(ddfpxx.getDDH()); detail.setZFPDM(ddfpxx.getFPDM()); detail.setZFPHM(ddfpxx.getFPHM()); 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 dca09f63..7ca3a351 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 @@ -2037,8 +2037,9 @@ public class OrderInfoServiceImpl implements OrderInfoService { t.setXmmc(StringUtils.isBlank(t.getXmmc())?"":t.getXmmc()); t.setXmdw(StringUtils.isBlank(t.getXmdw())?"":t.getXmdw()); t.setGgxh(StringUtils.isBlank(t.getGgxh())?"":t.getGgxh()); + t.setZxbm(StringUtils.isBlank(t.getZxbm())?"":t.getZxbm()); return t; - }).collect(Collectors.groupingBy(t -> t.getFphxz() + t.getXmmc() + t.getXmdw() + t.getGgxh() + t.getSl() + t.getSpbm())); + }).collect(Collectors.groupingBy(t -> t.getFphxz() + t.getXmmc() + t.getXmdw() + t.getGgxh() + t.getSl() + t.getSpbm() + t.getZxbm())); List orderItemInfoList = new ArrayList<>(); List deleteItem = new ArrayList<>(); for (List value : collect1.values()) { @@ -2059,21 +2060,32 @@ public class OrderInfoServiceImpl implements OrderInfoService { //重算税额 String hsbz = orderItemInfo.getHsbz(); BigDecimal taxRate = new BigDecimal(orderItemInfo.getSl()); - BigDecimal taxAmout = new BigDecimal(orderItemInfo.getXmje()); + BigDecimal taxAmount = new BigDecimal(orderItemInfo.getSe()); if (OrderInfoEnum.HSBZ_1.getKey().equals(hsbz)) { - taxAmout = xmje.divide(new BigDecimal("1").add(taxRate),0).multiply(taxRate).setScale(2,RoundingMode.HALF_UP); + taxAmount = xmje.divide(new BigDecimal("1").add(taxRate),0).multiply(taxRate).setScale(2,RoundingMode.HALF_UP); } else if (OrderInfoEnum.HSBZ_0.getKey().equals(hsbz)) { - taxAmout = xmje.multiply(taxRate).setScale(2,RoundingMode.HALF_UP); + taxAmount = xmje.multiply(taxRate).setScale(2,RoundingMode.HALF_UP); } orderItemInfo.setCreateTime(new Date()); orderItemInfo.setSe(se.toString()); - if(se.subtract(taxAmout).abs().longValue() <= 0.06){ - orderItemInfoList.add(orderItemInfo); - deleteItem.addAll(value.stream().map(t->t.getId()).collect(Collectors.toList())); - }else{ + if(se.subtract(taxAmount).abs().longValue() > 0.06){ + BigDecimal taxAndAmount = xmje.add(se); + BigDecimal taxAmountNew = taxAndAmount.divide(new BigDecimal("1").add(taxRate),0).multiply(taxRate).setScale(2,RoundingMode.HALF_UP); + BigDecimal xmjeNew = taxAndAmount.multiply(taxAmountNew); + orderItemInfo.setXmje(xmje.toString()); + orderItemInfo.setSe(taxAmountNew.toString()); + if(StringUtils.isNotBlank(orderItemInfo.getXmsl())){ + BigDecimal xmdj = xmjeNew.divide(xmsl, 8, RoundingMode.HALF_UP); + if(xmdj.multiply(xmsl).subtract(xmjeNew).longValue() > 0.01){ + orderItemInfo.setXmsl(xmjeNew.divide(xmdj,8,RoundingMode.HALF_UP).toString()); + } + orderItemInfo.setXmdj(xmdj.toString()); + } log.info("订单id:{}合并明细超过0.06暂时不合并",orderInfoId); - return R.error("明细行号{}合并错误,合并明细超过0.06暂时不合并",orderItemInfo.getSphxh()); +// return R.error("明细行号{}合并错误,合并明细超过0.06暂时不合并",orderItemInfo.getSphxh()); } + orderItemInfoList.add(orderItemInfo); + deleteItem.addAll(value.stream().map(t->t.getId()).collect(Collectors.toList())); } // OrderInfo orderInfo = new OrderInfo(); // orderInfo.setId(orderInfoId);