From d250efd3c8de9e3d105adac47c74091d71318445 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Tue, 18 Jul 2023 17:46:27 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feature=201.=E6=8F=90=E7=A4=BA=E6=96=87?= =?UTF-8?q?=E6=A1=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java index d1c71780..33b7af34 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java @@ -262,7 +262,7 @@ public enum ExcelErrorMessageEnum { ORDERINFO_SSFLBM_SL_NULL("9611", "该商品税率没有维护，不能为空"), - ORDERINFO_9701("9701", "企业自编码长度超过16位"), + ORDERINFO_9701("9701", "企业自编码长度超过18位"), ORDERINFO_9702("9702", "编码表版本号长度超过10位"), From f9d11ef19ba78248ea69550cda5ac1ad61d95485 Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Fri, 21 Jul 2023 15:03:42 +0800 Subject: [PATCH 2/7] =?UTF-8?q?redis=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- order-management-consumer/src/main/resources/bootstrap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/resources/bootstrap.yaml b/order-management-consumer/src/main/resources/bootstrap.yaml index e3025400..615d747e 100644 --- a/order-management-consumer/src/main/resources/bootstrap.yaml +++ b/order-management-consumer/src/main/resources/bootstrap.yaml @@ -40,8 +40,8 @@ sims: #订单数据库类型区分,要么mysql,要么Oracle,要么weblogic db: mysql #订单redis数据库类型区分,要么redis,要么redis-sentinel -# redisDb: redis-sentinel - redisDb: redis + redisDb: redis-sentinel +# redisDb: redis # 0 mysql 1 oracle dataType: 0 From c490a5036677a0d2df60f0f27cd4d4974290409a Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Thu, 27 Jul 2023 09:28:48 +0800 Subject: [PATCH 3/7] =?UTF-8?q?feature=201.=E6=98=8E=E7=B4=B0=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=95=8F=E9=A1=8C=E4=BF=AE=E5=BE=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderMergeServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java index c228660e..7bea5382 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java @@ -953,7 +953,11 @@ public class OrderMergeServiceImpl implements OrderMergeService { List deleteItem = new ArrayList<>(); log.debug("明细合并前明细数据，{}",JSONObject.toJSONString(orderItemInfos)); for (List value : collect1.values()) { - if(value.size() == 1){continue;} + if(value.size() == 1){ + orderItemInfoList.add(value.get(0)); + deleteItem.add(value.get(0).getId()); + continue; + } BigDecimal xmsl = new BigDecimal("0"); BigDecimal xmje = new BigDecimal("0"); BigDecimal se = new BigDecimal("0"); From 320f70614bee353d8e6d58f8fd41c8d34527f2a3 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Thu, 27 Jul 2023 12:52:26 +0800 Subject: [PATCH 4/7] =?UTF-8?q?feature=201.=E6=98=8E=E7=BB=86=E8=A1=8C?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=90=88=E8=AE=A1=E7=A8=8E=E9=A2=9D=E8=B6=85?= =?UTF-8?q?=E8=BF=87=E8=8C=83=E5=9B=B4=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/OrderInfoServiceImpl.java | 12 +++++++----- .../order/service/impl/OrderMergeServiceImpl.java | 3 +-- 2 files changed, 8 insertions(+), 7 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 94530fe5..46adad4d 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 @@ -27,7 +27,6 @@ import com.dxhy.order.baseservice.utils.BaseServiceBeanTransitionUtils; import com.dxhy.order.constant.*; import com.dxhy.order.consumer.dao.GroupCommodityCodeMapper; import com.dxhy.order.consumer.dao.GsClientMapper; -import com.dxhy.order.consumer.dao.OrderBatchRequestMapper; import com.dxhy.order.consumer.dao.OrderProcessInfoMapper; import com.dxhy.order.consumer.model.OderDetailInfo; import com.dxhy.order.consumer.model.PageOrderExt; @@ -36,8 +35,8 @@ import com.dxhy.order.consumer.modules.order.model.PageInvoiceItem; import com.dxhy.order.consumer.modules.order.model.PageKySlReq; import com.dxhy.order.consumer.modules.order.model.PageKySlRsp; import com.dxhy.order.consumer.modules.order.model.bo.YwlxCountTotalBO; -import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoVo; import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoTotalAmountVO; +import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoVo; import com.dxhy.order.consumer.modules.order.service.*; import com.dxhy.order.consumer.modules.validate.service.ValidateOrderInfoService; import com.dxhy.order.consumer.openapi.service.CommonInterfaceService; @@ -2027,13 +2026,16 @@ public class OrderInfoServiceImpl implements OrderInfoService { return R.error("根据订单号未查询到明细行信息"); } List collect ; + int itemCount = -1; if(itemList != null){ + itemCount = itemList.size(); collect = orderItemInfos.stream().filter(t -> itemList.contains(t.getId()) && StringUtils.isNotBlank(t.getSpbm()) && StringUtils.isNotBlank(t.getZxbm())).collect(Collectors.toList()); }else{ + itemCount = orderItemInfos.size(); collect = orderItemInfos.stream().filter(t -> StringUtils.isNotBlank(t.getSpbm()) && StringUtils.isNotBlank(t.getZxbm())).collect(Collectors.toList()); } //税编为空的不允许合并 - if(itemList.size() != collect.size()){ + if(itemCount != collect.size()){ return R.error("税收编码为空的不允许合并，请先更新税收编码"); } TaxEquipmentInfo taxEquipmentInfo = simsBackService.queryTaxEquipment(orderInfo.getNsrsbh(), entId); @@ -2060,10 +2062,10 @@ public class OrderInfoServiceImpl implements OrderInfoService { try { R r = mergeOrderItem(entId,orderInfoId, null); if(!ConfigureConstant.STRING_0000.equals(r.getCode())){ - return R.error(String.format("结算单号%s明细行合并失败",ddh)); + return r; } } catch (Exception e) { - log.error("批量合并报错orderInfoId:{},entId:{},报错信息:{}",orderInfoId,entId,e.getMessage()); + log.error("批量合并报错orderInfoId:{},entId:{},报错信息:{}",orderInfoId,entId,e); return R.error(String.format("结算单号%s明细行合并失败",ddh)); } } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java index 7bea5382..0a7329b1 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java @@ -954,8 +954,7 @@ public class OrderMergeServiceImpl implements OrderMergeService { log.debug("明细合并前明细数据，{}",JSONObject.toJSONString(orderItemInfos)); for (List value : collect1.values()) { if(value.size() == 1){ - orderItemInfoList.add(value.get(0)); - deleteItem.add(value.get(0).getId()); + mergeOutItem.add(value.get(0)); continue; } BigDecimal xmsl = new BigDecimal("0"); From 2a8f951cbd9b17a4dfd55033e4b21f1026f8d3d5 Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 28 Jul 2023 11:03:39 +0800 Subject: [PATCH 5/7] =?UTF-8?q?feature=EF=BC=9A=E8=A1=A5=E5=BD=95=E6=8A=A5?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E5=8F=B7=E8=87=AA=E5=8A=A8=E6=8E=A8=E9=80=81?= =?UTF-8?q?SAP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controller/OrderInfoController.java | 7 +++++-- .../modules/order/service/OrderInfoService.java | 2 +- .../order/service/impl/OrderInfoServiceImpl.java | 15 +++++++++++++-- 3 files changed, 19 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 ee5d09f0..2d1f59fd 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 @@ -165,12 +165,15 @@ public class OrderInfoController { @PostMapping("/updateBillNumber") @ApiOperation(value = "发票列表", notes = "发票列表修改报账单号") @SysLog(operation = "发票列表", operationDesc = "发票列表修改报账单号", key = "订单发票管理") - public R updateBillNumber(@RequestParam("bzdh") String bzdh, @RequestParam("orderInfoId") String orderInfoId) { + public R updateBillNumber(@RequestParam("bzdh") String bzdh, + @RequestParam("orderInfoId") String orderInfoId, + @RequestParam("fpqqlsh")String fpqqlsh, + @RequestParam("xhfNsrsbh")String xhfNsrsbh) { if(StringUtils.isBlank(bzdh)||StringUtils.isBlank(orderInfoId)){ return R.error("请求参数有误"); } try { - int i = orderInfoService.updateBillNumber(bzdh, orderInfoId); + int i = orderInfoService.updateBillNumber(bzdh, orderInfoId,fpqqlsh,xhfNsrsbh); if(i > 0){ return R.ok(); } 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 c366bf0b..35a61a6c 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 @@ -222,7 +222,7 @@ public interface OrderInfoService { R ratioConversion(List orderInfoIds,String ratio,String xhfNsrsbh,String originUnit,String newUnit); - int updateBillNumber(String bzdh,String orderInfoId); + int updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh); @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 46adad4d..5ff39aaa 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 @@ -31,6 +31,7 @@ import com.dxhy.order.consumer.dao.OrderProcessInfoMapper; import com.dxhy.order.consumer.model.OderDetailInfo; import com.dxhy.order.consumer.model.PageOrderExt; import com.dxhy.order.consumer.model.page.PageRequestVO; +import com.dxhy.order.consumer.modules.manager.service.InvoiceDataService; import com.dxhy.order.consumer.modules.order.model.PageInvoiceItem; import com.dxhy.order.consumer.modules.order.model.PageKySlReq; import com.dxhy.order.consumer.modules.order.model.PageKySlRsp; @@ -188,6 +189,9 @@ public class OrderInfoServiceImpl implements OrderInfoService { @Resource private OrderMergeService orderMergeService; + @Resource + private InvoiceDataService invoiceDataService; + DecimalFormat format = new DecimalFormat("#.###"); @Override @@ -1743,11 +1747,18 @@ public class OrderInfoServiceImpl implements OrderInfoService { } @Override - public int updateBillNumber(String bzdh,String orderInfoId){ + public int updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh){ OrderProcessInfo orderProcessInfo = new OrderProcessInfo(); orderProcessInfo.setBzdh(bzdh); orderProcessInfo.setOrderInfoId(orderInfoId); - return orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo,null); + int i = orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo, null); + if(i > 0) { + Map map = new HashMap(); + map.put("ddqqlsh",""); + map.put("xhfNsrsbh",""); + invoiceDataService.manualPushInvoice(Arrays.asList(map)); + } + return i; } @Override From 13eeec0920c72638d2bf28b984dbd88f64e9d6b0 Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 28 Jul 2023 11:20:15 +0800 Subject: [PATCH 6/7] =?UTF-8?q?feature=EF=BC=9A=E5=8F=91=E7=A5=A8=E5=9B=9E?= =?UTF-8?q?=E6=8E=A8bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/service/impl/PushInvoiceServiceImpl.java | 4 ++-- .../service/impl/PushTicketPoolServiceImpl.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 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 d0e20937..c64a3631 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 @@ -230,7 +230,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { //推送票池 try { - if (StringUtils.isNotBlank(commonTsMqData.getFpTsMqData().getFpdm()) && StringUtils.isNotBlank(commonTsMqData.getFpTsMqData().getFphm())) { + if (StringUtils.isNotBlank(commonTsMqData.getFpTsMqData().getFphm())) { pushTicketPoolService.pushTicketPool(commonTsMqData.getFpTsMqData().getFpdm(), commonTsMqData.getFpTsMqData().getFphm(), commonTsMqData.getNsrsbh()); } @@ -251,7 +251,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { } //推送票池 try { - if (StringUtils.isNotBlank(commonTsMqData.getZfTsMqData().getFpdm()) && StringUtils.isNotBlank(commonTsMqData.getZfTsMqData().getFphm())) { + if (StringUtils.isNotBlank(commonTsMqData.getZfTsMqData().getFphm())) { pushTicketPoolService.pushTicketPool(commonTsMqData.getZfTsMqData().getFpdm(), commonTsMqData.getZfTsMqData().getFphm(), commonTsMqData.getNsrsbh()); } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/ticketpool/service/impl/PushTicketPoolServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/ticketpool/service/impl/PushTicketPoolServiceImpl.java index d1262ac0..b2dbd139 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/ticketpool/service/impl/PushTicketPoolServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/ticketpool/service/impl/PushTicketPoolServiceImpl.java @@ -85,10 +85,10 @@ public class PushTicketPoolServiceImpl implements PushTicketPoolService { OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoMapper.selectOrderInvoiceInfo(orderInvoiceInfo1, shList); log.info("{}推送接口orderInvoiceInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderInvoiceInfo)); - if (ObjectUtil.isEmpty(orderInvoiceInfo) || !OrderInfoEnum.INVOICE_STATUS_2.getKey().equals(orderInvoiceInfo.getKpzt())) { - log.warn("{}发票数据不存在,或者发票状态不是开票中,数据不进行推送", LOGGER_MSG); - return R.ok(); - } +// if (ObjectUtil.isEmpty(orderInvoiceInfo) || !OrderInfoEnum.INVOICE_STATUS_2.getKey().equals(orderInvoiceInfo.getKpzt())) { +// log.warn("{}发票数据不存在,或者发票状态不是开票中,数据不进行推送", LOGGER_MSG); +// return R.ok(); +// } if (ConfigureConstant.STRING_Y.equals(openApiConfig.configPushTicketPoolStatus())) { From fe06981c635f066e7a2ef9197648005e74aba8fe Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 1 Aug 2023 10:42:55 +0800 Subject: [PATCH 7/7] =?UTF-8?q?feature=EF=BC=9A=E5=B1=B1=E8=83=BD=E6=98=93?= =?UTF-8?q?=E8=A1=8C=E8=B4=9F=E6=95=B0=E5=8F=91=E7=A5=A8=E5=9B=9E=E6=8E=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/service/impl/PushInvoiceServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 c64a3631..d2e46303 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 @@ -1495,7 +1495,13 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { log.info("{}推送接口orderProcessInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderProcessInfo)); if(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(orderProcessInfo.getXtly())){ List orderProcessInfos = orderProcessService.queryOrderProcessInfoByBzdh(orderProcessInfo.getBzdh(), shList); - int count = (int)orderProcessInfos.stream().filter(t -> OrderInfoEnum.ORDER_STATUS_5.getKey().equals(t.getDdzt())).count(); + int count = (int)orderProcessInfos.stream().filter(t ->{ + if(new BigDecimal(orderProcessInfo.getKphjje()).compareTo(BigDecimal.ZERO) > 0){ + return OrderInfoEnum.ORDER_STATUS_5.getKey().equals(t.getDdzt()); + }else{ + return OrderInfoEnum.ORDER_STATUS_7.getKey().equals(t.getDdzt()); + } + }).count(); if(orderProcessInfos.size() != count){ return null; }