From b4b51c82881617da958897662c31870cb9da2810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= Date: Tue, 19 Sep 2023 11:35:46 +0800 Subject: [PATCH 01/13] =?UTF-8?q?feature:=20=E8=A1=A5=E5=BD=95=E6=8A=A5?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E5=8F=B7=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/order/constant/OrderInfoContentEnum.java | 2 ++ .../modules/order/controller/OrderInfoController.java | 2 +- .../modules/order/service/impl/OrderInfoServiceImpl.java | 8 +++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java index 31e02916..0e91bf1d 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java @@ -236,6 +236,8 @@ public enum OrderInfoContentEnum { INVOICE_BZDH_OPERATED("9645", "此报账单已做其他操作"), + INVOICE_BZDH_REPEAT_OPERATED("9646", "此报账单已关联其他发票,请注意重复补录"), + INVOICE_BILLING_ORDERITEM_XMMC_NULL_ERROR("2000", "发票明细中的商品名称为空!"), diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java index b77016ff..928102ad 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java @@ -164,7 +164,7 @@ public class OrderInfoController { @PostMapping("/updateBillNumber") @ApiOperation(value = "发票列表", notes = "发票列表修改报账单号") - @SysLog(operation = "发票列表", operationDesc = "发票列表修改报账单号", key = "订单发票管理") + @SysLog(operation = "发票列表", operationDesc = "补录报账单号", key = "订单发票管理") public R updateBillNumber(@RequestParam("bzdh") String bzdh, @RequestParam("orderInfoId") String orderInfoId, @RequestParam("fpqqlsh")String fpqqlsh, 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 c0785395..f12da76e 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 @@ -1764,9 +1764,15 @@ public class OrderInfoServiceImpl implements OrderInfoService { } if(orderProcessInfo != null){ - if(!OrderInfoEnum.ORDER_STATUS_0.getKey().equals(orderProcessInfo.getDdzt())){ + if(!OrderInfoEnum.ORDER_STATUS_0.getKey().equals(orderProcessInfo.getDdzt()) && OrderInfoEnum.ORDER_SOURCE_3.getKey().equals(orderProcessInfo.getDdly())){ + throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_BZDH_OPERATED); } + if((OrderInfoEnum.ORDER_STATUS_5.getKey().equals(orderProcessInfo.getDdzt()) || OrderInfoEnum.ORDER_STATUS_7.getKey().equals(orderProcessInfo.getDdzt())) + &&!OrderInfoEnum.ORDER_SOURCE_3.getKey().equals(orderProcessInfo.getDdly())){ + throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_BZDH_REPEAT_OPERATED); + } + OrderProcessInfo orderProcessInfo1 = new OrderProcessInfo(); orderProcessInfo1.setOrderStatus(OrderInfoEnum.ORDER_VALID_STATUS_1.getKey()); orderProcessInfo1.setOrderInfoId(orderProcessInfo.getOrderInfoId()); From 0aab8bcef58e0c430cff77b81c4fe1216570e8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= Date: Tue, 19 Sep 2023 13:54:07 +0800 Subject: [PATCH 02/13] =?UTF-8?q?feature:=E8=A1=A5=E5=BD=95=E6=8A=A5?= =?UTF-8?q?=E8=B4=A6=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumer/modules/order/controller/OrderInfoController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java index 928102ad..038f429e 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java @@ -179,7 +179,8 @@ public class OrderInfoController { return R.ok(); } catch (Exception e) { if(e instanceof OrderReceiveException){ - return R.error(e.getMessage()); + OrderReceiveException e1 = (OrderReceiveException) e; + return R.error(e1.getCode(),e1.getMessage()); } log.error(e.getMessage()); return R.error(OrderInfoContentEnum.INTERNAL_SERVER_ERROR); From 448ab80a1f3d9a70c7cd88926c9a795e441305d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= Date: Tue, 19 Sep 2023 14:17:55 +0800 Subject: [PATCH 03/13] =?UTF-8?q?feature:=E8=A1=A5=E5=BD=95=E6=8A=A5?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controller/OrderInfoController.java | 14 ++++++++++++-- .../modules/order/service/OrderInfoService.java | 2 +- .../order/service/impl/OrderInfoServiceImpl.java | 4 ++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java index 038f429e..a08982a5 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java @@ -162,19 +162,29 @@ public class OrderInfoController { } } + /** + * + * @param bzdh + * @param orderInfoId + * @param fpqqlsh + * @param xhfNsrsbh + * @param force 是否强制补录,0 不强制,1是强制补录 + * @return + */ @PostMapping("/updateBillNumber") @ApiOperation(value = "发票列表", notes = "发票列表修改报账单号") @SysLog(operation = "发票列表", operationDesc = "补录报账单号", key = "订单发票管理") public R updateBillNumber(@RequestParam("bzdh") String bzdh, @RequestParam("orderInfoId") String orderInfoId, @RequestParam("fpqqlsh")String fpqqlsh, - @RequestParam("xhfNsrsbh")String xhfNsrsbh + @RequestParam("xhfNsrsbh")String xhfNsrsbh, + @RequestParam("force") String force ) { if(StringUtils.isBlank(bzdh)||StringUtils.isBlank(orderInfoId)){ return R.error("请求参数有误"); } try { - orderInfoService.updateBillNumber(bzdh, orderInfoId,fpqqlsh,xhfNsrsbh); + orderInfoService.updateBillNumber(bzdh, orderInfoId,fpqqlsh,xhfNsrsbh,force); return R.ok(); } catch (Exception e) { diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java index 84972d5c..ff13a006 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java @@ -223,7 +223,7 @@ public interface OrderInfoService { R ratioConversion(List orderInfoIds,String ratio,String xhfNsrsbh,String originUnit,String newUnit); @Transactional - void updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh) throws Exception; + void updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh,String force) throws Exception; @Transactional R logicalDeleteByOrderInfoId(List pageRequestList); 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 f12da76e..141d7286 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 @@ -1752,7 +1752,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { } @Override - public void updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh) throws Exception{ + public void updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh,String force) throws Exception{ //通过报账单查询订单,如果存在则删除 List orderProcessInfos = orderProcessInfoMapper.queryOrderProcessInfoByBzdh(bzdh,"", Arrays.asList(xhfNsrsbh)); OrderProcessInfo orderProcessInfo = null; @@ -1769,7 +1769,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_BZDH_OPERATED); } if((OrderInfoEnum.ORDER_STATUS_5.getKey().equals(orderProcessInfo.getDdzt()) || OrderInfoEnum.ORDER_STATUS_7.getKey().equals(orderProcessInfo.getDdzt())) - &&!OrderInfoEnum.ORDER_SOURCE_3.getKey().equals(orderProcessInfo.getDdly())){ + &&!OrderInfoEnum.ORDER_SOURCE_3.getKey().equals(orderProcessInfo.getDdly()) && ConfigureConstant.STRING_0.equals(force)){ throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_BZDH_REPEAT_OPERATED); } From ca49fa8786bd685010b6c7ceb390a45adb55396d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= Date: Tue, 19 Sep 2023 14:43:38 +0800 Subject: [PATCH 04/13] =?UTF-8?q?feature:=20=E8=A1=A5=E5=BD=95=E6=8A=A5?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/OrderInfoServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 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 141d7286..86c1c452 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 @@ -1772,11 +1772,12 @@ public class OrderInfoServiceImpl implements OrderInfoService { &&!OrderInfoEnum.ORDER_SOURCE_3.getKey().equals(orderProcessInfo.getDdly()) && ConfigureConstant.STRING_0.equals(force)){ throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_BZDH_REPEAT_OPERATED); } - - OrderProcessInfo orderProcessInfo1 = new OrderProcessInfo(); - orderProcessInfo1.setOrderStatus(OrderInfoEnum.ORDER_VALID_STATUS_1.getKey()); - orderProcessInfo1.setOrderInfoId(orderProcessInfo.getOrderInfoId()); - orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo1, Arrays.asList(xhfNsrsbh)); + if(ConfigureConstant.STRING_0.equals(force)){ + OrderProcessInfo orderProcessInfo1 = new OrderProcessInfo(); + orderProcessInfo1.setOrderStatus(OrderInfoEnum.ORDER_VALID_STATUS_1.getKey()); + orderProcessInfo1.setOrderInfoId(orderProcessInfo.getOrderInfoId()); + orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo1, Arrays.asList(xhfNsrsbh)); + } } OrderProcessInfo orderProcessInfo2 = new OrderProcessInfo(); orderProcessInfo2.setBzdh(bzdh); From 0552e5d5d5ca0a3beb92a7196181e5afede304a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= Date: Tue, 19 Sep 2023 17:14:01 +0800 Subject: [PATCH 05/13] =?UTF-8?q?feature:=E8=A1=A5=E5=BD=95=E6=8A=A5?= =?UTF-8?q?=E8=B4=A6=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 86c1c452..0c5233c4 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 @@ -1756,11 +1756,12 @@ public class OrderInfoServiceImpl implements OrderInfoService { //通过报账单查询订单,如果存在则删除 List orderProcessInfos = orderProcessInfoMapper.queryOrderProcessInfoByBzdh(bzdh,"", Arrays.asList(xhfNsrsbh)); OrderProcessInfo orderProcessInfo = null; - if(orderProcessInfos.size() > 1){ + List orderProcessInfoList = orderProcessInfos.stream().filter(t -> OrderInfoEnum.ORDER_STATUS_0.getKey().equals(t.getDdzt())).collect(Collectors.toList()); + if(orderProcessInfoList.size() > 1){ throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_BZDH_MULTIPLE); } - if(orderProcessInfos.size() == 1){ - orderProcessInfo = orderProcessInfos.get(0); + if(orderProcessInfoList.size() == 1){ + orderProcessInfo = orderProcessInfoList.get(0); } if(orderProcessInfo != null){ @@ -1782,7 +1783,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { OrderProcessInfo orderProcessInfo2 = new OrderProcessInfo(); orderProcessInfo2.setBzdh(bzdh); orderProcessInfo2.setOrderInfoId(orderInfoId); - orderProcessInfo2.setXtly(orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getXtly()) ? orderProcessInfo.getXtly() : ""); + orderProcessInfo2.setXtly(orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getXtly()) ? orderProcessInfo.getXtly() : orderProcessInfos.size() > 0 && StringUtils.isNotBlank(orderProcessInfos.get(0).getXtly())?orderProcessInfos.get(0).getXtly():""); int i = orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo2, Arrays.asList(xhfNsrsbh)); if(i > 0) { Map map = new HashMap(); From b99317650d46c9b2247cbf1c1f35e3a617695df6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= Date: Thu, 21 Sep 2023 09:10:05 +0800 Subject: [PATCH 06/13] =?UTF-8?q?feature:=E8=A1=A5=E5=BD=95=E6=8A=A5?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E5=8F=B7?= 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 0c5233c4..cb49eebf 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 @@ -1760,8 +1760,8 @@ public class OrderInfoServiceImpl implements OrderInfoService { if(orderProcessInfoList.size() > 1){ throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_BZDH_MULTIPLE); } - if(orderProcessInfoList.size() == 1){ - orderProcessInfo = orderProcessInfoList.get(0); + if(orderProcessInfos.size() == 1){ + orderProcessInfo = orderProcessInfos.get(0); } if(orderProcessInfo != null){ From 3b0826cec74974dcc288f34e6fb82d4a4d63f0f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= Date: Thu, 21 Sep 2023 09:37:06 +0800 Subject: [PATCH 07/13] =?UTF-8?q?feature:=E8=A1=A5=E5=BD=95=E6=8A=A5?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E5=8F=B7?= 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 cb49eebf..3cf88c0d 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 @@ -1760,7 +1760,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { if(orderProcessInfoList.size() > 1){ throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_BZDH_MULTIPLE); } - if(orderProcessInfos.size() == 1){ + if(orderProcessInfos.size() > 0){ orderProcessInfo = orderProcessInfos.get(0); } From f33ac89f3efc7efafbbd6b27d2839124f9362286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= Date: Thu, 21 Sep 2023 10:10:23 +0800 Subject: [PATCH 08/13] =?UTF-8?q?feature:=E8=A1=A5=E5=BD=95=E6=8A=A5?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 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 3cf88c0d..cd43c2e1 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 @@ -1765,7 +1765,8 @@ public class OrderInfoServiceImpl implements OrderInfoService { } if(orderProcessInfo != null){ - if(!OrderInfoEnum.ORDER_STATUS_0.getKey().equals(orderProcessInfo.getDdzt()) && OrderInfoEnum.ORDER_SOURCE_3.getKey().equals(orderProcessInfo.getDdly())){ + if((!OrderInfoEnum.ORDER_STATUS_0.getKey().equals(orderProcessInfo.getDdzt())||ConfigureConstant.STRING_1.equals(orderProcessInfo.getYzfp())) + && OrderInfoEnum.ORDER_SOURCE_3.getKey().equals(orderProcessInfo.getDdly())){ throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_BZDH_OPERATED); } From 7640037f9fc3847a1fe2d607eb5d9d45e0271e0f Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Tue, 17 Oct 2023 16:15:28 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E8=A1=A5=E5=BD=95=E6=8A=A5=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=20=E6=9B=B4=E6=96=B0=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= 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 cd43c2e1..66e80f3b 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 @@ -64,7 +64,6 @@ import com.dxhy.order.model.qdsk.taxpayerinfo.Qdjcxx; import com.dxhy.order.utils.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -1785,6 +1784,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { orderProcessInfo2.setBzdh(bzdh); orderProcessInfo2.setOrderInfoId(orderInfoId); orderProcessInfo2.setXtly(orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getXtly()) ? orderProcessInfo.getXtly() : orderProcessInfos.size() > 0 && StringUtils.isNotBlank(orderProcessInfos.get(0).getXtly())?orderProcessInfos.get(0).getXtly():""); + orderProcessInfo2.setGsdm(orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getGsdm()) ? orderProcessInfo.getGsdm() : orderProcessInfos.size() > 0 && StringUtils.isNotBlank(orderProcessInfos.get(0).getGsdm())?orderProcessInfos.get(0).getGsdm():""); int i = orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo2, Arrays.asList(xhfNsrsbh)); if(i > 0) { Map map = new HashMap(); From 714ae3e325220275d9d718b289985e98b15a4d4a Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Wed, 18 Oct 2023 09:45:57 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E8=A1=A5=E5=BD=95=E6=8A=A5=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=20,=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8F=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 insertion(+) 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 66e80f3b..749488c6 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 @@ -1785,6 +1785,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { orderProcessInfo2.setOrderInfoId(orderInfoId); orderProcessInfo2.setXtly(orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getXtly()) ? orderProcessInfo.getXtly() : orderProcessInfos.size() > 0 && StringUtils.isNotBlank(orderProcessInfos.get(0).getXtly())?orderProcessInfos.get(0).getXtly():""); orderProcessInfo2.setGsdm(orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getGsdm()) ? orderProcessInfo.getGsdm() : orderProcessInfos.size() > 0 && StringUtils.isNotBlank(orderProcessInfos.get(0).getGsdm())?orderProcessInfos.get(0).getGsdm():""); + orderProcessInfo2.setDdh(orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getDdh()) ? orderProcessInfo.getDdh() : orderProcessInfos.size() > 0 && StringUtils.isNotBlank(orderProcessInfos.get(0).getDdh())?orderProcessInfos.get(0).getDdh():""); int i = orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo2, Arrays.asList(xhfNsrsbh)); if(i > 0) { Map map = new HashMap(); From e309172c372d4d496dcd221007224cc5d8c63b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= Date: Thu, 7 Dec 2023 14:04:45 +0800 Subject: [PATCH 11/13] =?UTF-8?q?feature:=E8=A1=A5=E5=BD=95=E6=8A=A5?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E5=8F=B7=EF=BC=8C=E7=B3=BB=E7=BB=9F=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E9=BB=98=E8=AE=A4SAP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 749488c6..f2df05be 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 @@ -1782,10 +1782,10 @@ public class OrderInfoServiceImpl implements OrderInfoService { } OrderProcessInfo orderProcessInfo2 = new OrderProcessInfo(); orderProcessInfo2.setBzdh(bzdh); - orderProcessInfo2.setOrderInfoId(orderInfoId); - orderProcessInfo2.setXtly(orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getXtly()) ? orderProcessInfo.getXtly() : orderProcessInfos.size() > 0 && StringUtils.isNotBlank(orderProcessInfos.get(0).getXtly())?orderProcessInfos.get(0).getXtly():""); - orderProcessInfo2.setGsdm(orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getGsdm()) ? orderProcessInfo.getGsdm() : orderProcessInfos.size() > 0 && StringUtils.isNotBlank(orderProcessInfos.get(0).getGsdm())?orderProcessInfos.get(0).getGsdm():""); - orderProcessInfo2.setDdh(orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getDdh()) ? orderProcessInfo.getDdh() : orderProcessInfos.size() > 0 && StringUtils.isNotBlank(orderProcessInfos.get(0).getDdh())?orderProcessInfos.get(0).getDdh():""); + orderProcessInfo2.setOrderInfoId(orderInfoId);//作为更新where条件 + orderProcessInfo2.setXtly(orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getXtly()) ? orderProcessInfo.getXtly() : orderProcessInfos.size() > 0 && StringUtils.isNotBlank(orderProcessInfos.get(0).getXtly())?orderProcessInfos.get(0).getXtly():"SAP"); + orderProcessInfo2.setGsdm(orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getGsdm()) ? orderProcessInfo.getGsdm() : orderProcessInfos.size() > 0 && StringUtils.isNotBlank(orderProcessInfos.get(0).getGsdm())?orderProcessInfos.get(0).getGsdm():null); + orderProcessInfo2.setDdh(orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getDdh()) ? orderProcessInfo.getDdh() : orderProcessInfos.size() > 0 && StringUtils.isNotBlank(orderProcessInfos.get(0).getDdh())?orderProcessInfos.get(0).getDdh():null); int i = orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo2, Arrays.asList(xhfNsrsbh)); if(i > 0) { Map map = new HashMap(); From f43be2f9ef9c237c72f424ce14bdb8759c0ccb68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= Date: Thu, 7 Dec 2023 14:15:00 +0800 Subject: [PATCH 12/13] =?UTF-8?q?feature:=E8=A1=A5=E5=BD=95=E6=8A=A5?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E5=8F=B7=EF=BC=8C=E4=BF=AE=E6=94=B9order=5Fi?= =?UTF-8?q?nfo=E3=80=81order=5Finvoice=5Finfo=E7=9A=84=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/OrderInfoServiceImpl.java | 13 ++++++++++++- .../mybatis/mapper/OrderInvoiceInfoMapper.xml | 3 +++ 2 files changed, 15 insertions(+), 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 f2df05be..a20f0823 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 @@ -1785,8 +1785,19 @@ public class OrderInfoServiceImpl implements OrderInfoService { orderProcessInfo2.setOrderInfoId(orderInfoId);//作为更新where条件 orderProcessInfo2.setXtly(orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getXtly()) ? orderProcessInfo.getXtly() : orderProcessInfos.size() > 0 && StringUtils.isNotBlank(orderProcessInfos.get(0).getXtly())?orderProcessInfos.get(0).getXtly():"SAP"); orderProcessInfo2.setGsdm(orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getGsdm()) ? orderProcessInfo.getGsdm() : orderProcessInfos.size() > 0 && StringUtils.isNotBlank(orderProcessInfos.get(0).getGsdm())?orderProcessInfos.get(0).getGsdm():null); - orderProcessInfo2.setDdh(orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getDdh()) ? orderProcessInfo.getDdh() : orderProcessInfos.size() > 0 && StringUtils.isNotBlank(orderProcessInfos.get(0).getDdh())?orderProcessInfos.get(0).getDdh():null); + String ddh = orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getDdh()) ? orderProcessInfo.getDdh() : orderProcessInfos.size() > 0 && StringUtils.isNotBlank(orderProcessInfos.get(0).getDdh()) ? orderProcessInfos.get(0).getDdh() : null; + orderProcessInfo2.setDdh(ddh); int i = orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo2, Arrays.asList(xhfNsrsbh)); + if(StringUtils.isNotBlank(ddh)){ + OrderInfo orderInfo = new OrderInfo(); + orderInfo.setDdh(ddh); + orderInfo.setId(orderInfoId); + orderMapper.updateOrderInfoByOrderId(orderInfo,Arrays.asList(xhfNsrsbh)); + OrderInvoiceInfo orderInvoiceInfo = new OrderInvoiceInfo(); + orderInvoiceInfo.setOrderInfoId(orderInfoId); + orderInvoiceInfo.setDdh(ddh); + orderInvoiceInfoMapper.updateOrderInvoiceInfoByOrderId(orderInvoiceInfo,Arrays.asList(xhfNsrsbh)); + } if(i > 0) { Map map = new HashMap(); map.put("ddqqlsh",fpqqlsh); diff --git a/order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml b/order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml index 1809d6d8..000e5374 100644 --- a/order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml +++ b/order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml @@ -2222,6 +2222,9 @@ fpqqlsh = #{orderInvoiceInfo.fpqqlsh,jdbcType=VARCHAR}, + + ddh = #{orderInvoiceInfo.ddh,jdbcType=VARCHAR}, + update_time = #{orderInvoiceInfo.updateTime,jdbcType=TIMESTAMP}, From fdf707c39a7af1bdff8a293a104cc85e48e5c3e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= Date: Mon, 11 Dec 2023 17:17:09 +0800 Subject: [PATCH 13/13] =?UTF-8?q?feature:=E8=A1=A5=E5=BD=95=E6=8A=A5?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E5=8F=B7=EF=BC=8C=E5=85=AC=E5=8F=B8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=A1=AB=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/constant/OrderInfoContentEnum.java | 2 ++ .../service/impl/OrderInfoServiceImpl.java | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java index 0e91bf1d..0e048b38 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java @@ -225,6 +225,8 @@ public enum OrderInfoContentEnum { ORDER__SLD_NOT_CPY_ERROR("9638", "开具批次中包含成品油发票,但是受理点是非成品油受理点"), + ORDER__USER_INVALID_PERMISSIONS("9647", "当前用户关联组织权限不足,请关联对应组织再进行补录"), + READY_OPEN_ITEM_DJ_ERROR("9639", "请点击“编辑”按钮,去掉单价和数量,系统将自动按照限额拆分单据开票。"), GENERATE_READY_NCY_ERROR("9640", "农产品订单和非农产品订单不允许合并"), 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 a20f0823..58bb2537 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 @@ -22,6 +22,7 @@ import com.dxhy.order.baseservice.module.taxclass.dao.TaxClassCodeMapper; import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity; import com.dxhy.order.baseservice.module.thirdservice.simsback.service.SimsBackService; import com.dxhy.order.baseservice.module.thirdservice.user.model.DeptEntity; +import com.dxhy.order.baseservice.module.thirdservice.user.model.TaxPlayerCodeDept; import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService; import com.dxhy.order.baseservice.utils.BaseServiceBeanTransitionUtils; import com.dxhy.order.constant.*; @@ -1784,7 +1785,21 @@ public class OrderInfoServiceImpl implements OrderInfoService { orderProcessInfo2.setBzdh(bzdh); orderProcessInfo2.setOrderInfoId(orderInfoId);//作为更新where条件 orderProcessInfo2.setXtly(orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getXtly()) ? orderProcessInfo.getXtly() : orderProcessInfos.size() > 0 && StringUtils.isNotBlank(orderProcessInfos.get(0).getXtly())?orderProcessInfos.get(0).getXtly():"SAP"); - orderProcessInfo2.setGsdm(orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getGsdm()) ? orderProcessInfo.getGsdm() : orderProcessInfos.size() > 0 && StringUtils.isNotBlank(orderProcessInfos.get(0).getGsdm())?orderProcessInfos.get(0).getGsdm():null); + //查询entId,判断如果为空 + String gsdm = orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getGsdm()) ? orderProcessInfo.getGsdm() : orderProcessInfos.size() > 0 && StringUtils.isNotBlank(orderProcessInfos.get(0).getGsdm()) ? orderProcessInfos.get(0).getGsdm() : null; + if(StringUtils.isNotBlank(gsdm)){ + //根据orderInfoId 查询 发票公司代码是否为空 + OrderProcessInfo orderProcessInfo1 = orderProcessInfoMapper.selectByOrderId(orderInfoId, Arrays.asList(xhfNsrsbh)); + if(orderProcessInfo1 != null && StringUtils.isBlank(orderProcessInfo1.getGsdm())){ + //如果为空,根据entID查询大B获取公司代码 + List taxplayercodeDeptList = userInfoService.getUser().getTaxplayercodeDeptList(); + gsdm = taxplayercodeDeptList.stream().filter(t -> orderProcessInfo1.getEntId().equals(t.getDeptId())).map(t -> t.getEnterpriseNumbers()).findFirst().orElse(""); + if(StringUtils.isNotBlank(gsdm)){ + throw new OrderReceiveException(OrderInfoContentEnum.ORDER__USER_INVALID_PERMISSIONS); + } + } + } + orderProcessInfo2.setGsdm(gsdm); String ddh = orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getDdh()) ? orderProcessInfo.getDdh() : orderProcessInfos.size() > 0 && StringUtils.isNotBlank(orderProcessInfos.get(0).getDdh()) ? orderProcessInfos.get(0).getDdh() : null; orderProcessInfo2.setDdh(ddh); int i = orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo2, Arrays.asList(xhfNsrsbh));