From 198bbdad30775b214f3c135096e558926579dfb7 Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 24 Jul 2023 11:10:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feature=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumer/utils/BeanTransitionUtils.java | 55 +++++++++++++++---- 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 5ea71ffa..a884704f 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -3486,7 +3486,7 @@ public class BeanTransitionUtils { DdtxxBO ddtxxBO = new DdtxxBO(); List ddmxList = new ArrayList<>(); - if (OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(isinput.getSYSID())) { + if (OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(isinput.getSYSID()) || OrderInfoEnum.SYS_SOURCE_S4.getKey().equals(isinput.getSYSID())) { String zdataString = isinput.getZDATA(); FpkjReqSap req = JsonUtils.getInstance().parseObject(zdataString, FpkjReqSap.class); //批次信息 @@ -3506,10 +3506,10 @@ public class BeanTransitionUtils { // ddtxxBO.setXHFYH(""); // ddtxxBO.setXHFZH(""); // } else { - ddtxxBO.setXHFDZ(deptEntity.getTaxpayerAddress()); - ddtxxBO.setXHFDH(deptEntity.getTaxpayerPhone()); - ddtxxBO.setXHFYH(deptEntity.getTaxpayerBank()); - ddtxxBO.setXHFZH(deptEntity.getTaxpayerAccount()); + ddtxxBO.setXHFDZ(deptEntity.getTaxpayerAddress()); + ddtxxBO.setXHFDH(deptEntity.getTaxpayerPhone()); + ddtxxBO.setXHFYH(deptEntity.getTaxpayerBank()); + ddtxxBO.setXHFZH(deptEntity.getTaxpayerAccount()); // } ddtxxBO.setGMFBM(req.getZGFBH()); ddtxxBO.setKPR(req.getZKPRXM()); @@ -3519,6 +3519,9 @@ public class BeanTransitionUtils { ddtxxBO.setHJJE(req.getZBHSJE()); ddtxxBO.setHJSE(req.getZZSE()); ddtxxBO.setDDH(req.getZJSDH()); + if(StringUtils.isNotBlank(req.getZSNYX()) && ConfigureConstant.STRING_X.equals(req.getZSNYX())){ + ddtxxBO.setDDH(""); + } ddtxxBO.setBZDH(req.getZBZDH()); ddtxxBO.setXTLY(isinput.getSYSID()); //如果为X,表示数据来自电商系统，开票完成后需要推送给电商系统开票数据及板式文件。 @@ -3538,7 +3541,7 @@ public class BeanTransitionUtils { if(StringUtils.isNotBlank(req.getZDSXT()) && StringUtils.isNotBlank(req.getZDSYWFL())){ ddtxxBO.setXTLY(OrderInfoEnum.SYS_SOURCE_DSXT.getKey()+req.getZDSYWFL()); } - if(StringUtils.isNotBlank(req.getZSNYX())){ + if(StringUtils.isNotBlank(req.getZSNYX()) && ConfigureConstant.STRING_X.equals(req.getZSNYX())){ ddtxxBO.setXTLY(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey()); } ddtxxBO.setGSDM(req.getBUKRS()); @@ -3611,6 +3614,13 @@ public class BeanTransitionUtils { } ddmxxxBO.setPH(detail.getCHARG()); ddmxxxBO.setKB(ObjectUtil.isNull(detail.getKTYPE())?"":detail.getKTYPE()+(ObjectUtil.isNull(detail.getKNAME())?"":detail.getKNAME())); + BigDecimal decimal = new BigDecimal("0"); + if(StringUtils.isNotBlank(ddmxxxBO.getDJ()) && decimal.compareTo(new BigDecimal(ddmxxxBO.getDJ())) == 0) { + ddmxxxBO.setDJ(""); + } + if (StringUtils.isNotBlank(ddmxxxBO.getSPSL()) && decimal.compareTo(new BigDecimal(ddmxxxBO.getSPSL())) == 0) { + ddmxxxBO.setSPSL(""); + } //判断单价*数量与金额的差额大于0.01，大于的话则反算 //判断小数点后位数,默认为8位,如果为全电,为15位 if(!ConfigureConstant.STRING_1.equals(ddmxxxBO.getFPHXZ())){ @@ -3636,19 +3646,40 @@ public class BeanTransitionUtils { } //如果是山能易行按照物料编码分组拆分订单 - if(StringUtils.isNotBlank(ddtxxBO.getXTLY())){ + if(StringUtils.isNotBlank(ddtxxBO.getXTLY()) && OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(ddtxxBO.getXTLY())){ Map> collect = ddmxList.stream().collect(Collectors.groupingBy(t -> t.getZXBM())); - for (int i = 0; i < collect.size(); i++) { + log.info("拆分数据：{}", JSONObject.toJSONString(collect)); + for (Map.Entry> listEntry : collect.entrySet()) { + List ddmxxxBOS = listEntry.getValue(); DdzxxBO ddzxxBONew = new DdzxxBO(); DdtxxBO ddtxxBONew = new DdtxxBO(); List ddmxLists = new ArrayList<>(); - BeanUtils.copyProperties(ddtxxBO,ddtxxBONew); - ddmxLists.addAll(collect.get(i)); + BeanUtils.copyProperties(ddtxxBO, ddtxxBONew); + BigDecimal zje = new BigDecimal("0.00"); + BigDecimal bhsje = new BigDecimal("0.00"); + BigDecimal se = new BigDecimal("0.00"); + for (DdmxxxBO ddmxxxBO : ddmxxxBOS) { + if (StringUtils.isNotBlank(ddmxxxBO.getHSBZ()) && OrderInfoEnum.HSBZ_0.getKey().equals(ddmxxxBO.getHSBZ())) { + //不含稅 + BigDecimal bigDecimal = new BigDecimal(ddmxxxBO.getJE()).add(new BigDecimal(ddmxxxBO.getSE())); + zje = zje.add(bigDecimal); + bhsje = bhsje.add(new BigDecimal(ddmxxxBO.getJE())); + se = se.add(new BigDecimal(ddmxxxBO.getSE())); + } else { + //含稅 + zje = zje.add(new BigDecimal(ddmxxxBO.getJE())); + } + } + ddtxxBONew.setHJJE(bhsje.toPlainString()); + ddtxxBONew.setHJSE(se.toPlainString()); + ddtxxBONew.setJSHJ(zje.toPlainString()); + ddmxLists.addAll(ddmxxxBOS); - ddzxxBONew.setDDTXX(ddtxxBO); - ddzxxBONew.setDDMXXX(ddmxList); + ddzxxBONew.setDDTXX(ddtxxBONew); + ddzxxBONew.setDDMXXX(ddmxLists); ddzxxList.add(ddzxxBONew); } + }else{ ddzxxBO.setDDTXX(ddtxxBO); ddzxxBO.setDDMXXX(ddmxList); From 79999ae5f5db33b5df16f6df06f4e3128cc45cfb Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 24 Jul 2023 11:12:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feature=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dxhy/order/constant/OrderInfoEnum.java | 1 + 1 file changed, 1 insertion(+) diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java index 58153fa1..8e27b782 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java @@ -408,6 +408,7 @@ public enum OrderInfoEnum { SYS_SOURCE_DSXT01("DSXT01","DSXT01"), SYS_SOURCE_DSXT02("DSXT02","DSXT02"), SYS_SOURCE_SNYXX("SNYXX","SNYXX"), + SYS_SOURCE_S4("S4","S4"), /** * 订单类型（0:原始订单,1:拆分后订单,2:合并后订单,3:系统冲红订单,4:自动开票订单,5:作废重开订单;6:历史数据订单;7:发票修复数据） From fd41a367d0bc927b6f9d5912e7d3d342361cce2b Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 24 Jul 2023 18:44:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feature=EF=BC=9A=E5=B1=B1=E8=83=BD=E6=98=93?= =?UTF-8?q?=E8=A1=8C=E8=AE=A2=E5=8D=95=E5=9B=9E=E6=8E=A8=E3=80=81excel?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumer/dao/OrderProcessInfoMapper.java | 2 + .../service/impl/PushInvoiceServiceImpl.java | 133 ++++++++++-------- .../order/service/OrderProcessService.java | 2 + .../service/impl/OrderProcessServiceImpl.java | 5 + .../consumer/utils/BeanTransitionUtils.java | 3 + .../main/resources/download/OrderExcel.xlsx | Bin 12680 -> 12723 bytes .../resources/download/QdfpImportExcel.xlsx | Bin 12460 -> 12507 bytes .../mybatis/mapper/OrderProcessInfoMapper.xml | 26 ++++ 8 files changed, 109 insertions(+), 62 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java index f9c18ee3..3b2b5165 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java @@ -51,6 +51,8 @@ public interface OrderProcessInfoMapper { */ OrderProcessInfo queryOrderProcessInfoByFpqqlsh(@Param("fpqqlsh") String fpqqlsh, @Param("shList") List shList); + List queryOrderProcessInfoByBzdh(@Param("bzdh") String bzdh, @Param("shList")List shList); + /** * 根据批次号查询订单处理表数据 * 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 3a9e717d..3d0d421e 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 @@ -400,16 +400,16 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { //按照接口类型获取对应的报文数据 //推送影像系统 String content = getPushContent(fpTsMqData, pushInfo, shList); + if (StrUtil.isBlank(content)) { + log.warn("税号:{},组装请求报文为空,不进行推送数据", fpTsMqData.getNsrsbh()); + break; + } try { //推送影像系统 sendImageSys(content); } catch (Exception e) { e.printStackTrace(); } - if (StrUtil.isBlank(content)) { - log.warn("税号:{},组装请求报文为空,不进行推送数据", fpTsMqData.getNsrsbh()); - continue; - } OrderProcessInfo orderProcessInfo = null; Map requestMap = commonDisposeService.getRequestParameter(pushInfo.getNsrsbh(), pushInfo.getZipCode(), pushInfo.getEncryptCode(), content, pushInfo.getPushUrl(), pushInfo.getInterfaceType(), pushInfo.getVersionIdent()); if (OrderInfoEnum.INTERFACE_TYPE_INVOICE_PUSH_STATUS_1.getKey().equals(fpTsMqData.getPushType())) { @@ -1469,30 +1469,19 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { } String version = pushInfo.getVersionIdent(); String pushWjl = pushInfo.getPushWjl(); - + List orderProcessInfoList = new ArrayList<>(); OrderProcessInfo orderProcessInfo = orderProcessService.queryOrderProcessInfoByFpqqlsh(fpTsMqData.getFpqqlsh(), shList); log.info("{}推送接口orderProcessInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderProcessInfo)); - - OrderInfo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList); - log.info("{}推送接口orderInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderInfo)); - - List orderItemInfos = orderItemInfoService.selectOrderItemInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList); - List ddmxxxList = BeanTransitionUtils.transitionOrderInvoiceItemV3(orderItemInfos); - List orderInvoiceItems = BeanTransitionUtils.transitionOrderInvoiceItem(orderItemInfos); - - OrderInvoiceInfo orderInvoiceInfo1 = new OrderInvoiceInfo(); - orderInvoiceInfo1.setFpqqlsh(orderProcessInfo.getFpqqlsh()); - OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfo(orderInvoiceInfo1, shList); - log.info("{}推送接口orderInvoiceInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderInvoiceInfo)); - - List orderProcessInfoRelevantList = orderProcessService.findTopParentList(orderProcessInfo, shList); - List orderExtensionInfos = BeanTransitionUtils.transitionOrderExtensionInfos(orderProcessInfoRelevantList); - log.info("{}推送接口orderExtensionInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderExtensionInfos)); - - /** - * 查询税控设备信息 - */ - String terminalCode = orderInvoiceInfo.getSksbdm(); + 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(); + if(orderProcessInfos.size() != count){ + return null; + } + orderProcessInfoList.addAll(orderProcessInfos); + }else{ + orderProcessInfoList.add(orderProcessInfo); + } //判断推送版本 if (ConfigurerInfo.INTERFACE_VERSION_V5.equals(version) @@ -1500,9 +1489,10 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { List ddfpzxxV5s = new ArrayList<>(); try { - DdfpzxxV5 interfaceOrderV5 = interfaceServiceV5.getInterfaceOrderV5(orderProcessInfo, shList, ConfigureConstant.STRING_0); - - ddfpzxxV5s.add(interfaceOrderV5); + for (OrderProcessInfo processInfo : orderProcessInfoList) { + DdfpzxxV5 interfaceOrderV5 = interfaceServiceV5.getInterfaceOrderV5(processInfo, shList, ConfigureConstant.STRING_0); + ddfpzxxV5s.add(interfaceOrderV5); + } } catch (InterfaceException e) { throw new OrderReceiveException(e.getCode(), e.getMessage()); @@ -1512,6 +1502,25 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { content = JsonUtils.getInstance().toJsonString(ddfpzxxV5s); } else if (ConfigurerInfo.INTERFACE_VERSION_V4.equals(version) || ConfigurerInfo.INTERFACE_VERSION_V3.equals(version)) { + OrderInfo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList); + log.info("{}推送接口orderInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderInfo)); + + List orderItemInfos = orderItemInfoService.selectOrderItemInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList); + List ddmxxxList = BeanTransitionUtils.transitionOrderInvoiceItemV3(orderItemInfos); + List orderInvoiceItems = BeanTransitionUtils.transitionOrderInvoiceItem(orderItemInfos); + + OrderInvoiceInfo orderInvoiceInfo1 = new OrderInvoiceInfo(); + orderInvoiceInfo1.setFpqqlsh(orderProcessInfo.getFpqqlsh()); + OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfo(orderInvoiceInfo1, shList); + log.info("{}推送接口orderInvoiceInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderInvoiceInfo)); + + List orderProcessInfoRelevantList = orderProcessService.findTopParentList(orderProcessInfo, shList); + List orderExtensionInfos = BeanTransitionUtils.transitionOrderExtensionInfos(orderProcessInfoRelevantList); + log.info("{}推送接口orderExtensionInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderExtensionInfos)); + /** + * 查询税控设备信息 + */ + String terminalCode = orderInvoiceInfo.getSksbdm(); //新版本请求参数组装response DdfpcxRspBO ddfpcxRsp = new DdfpcxRspBO(); //新版本组装数据方式 @@ -1708,42 +1717,42 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { } } else { //旧版本请求参数组装response - PushReqBO response = new PushReqBO(); - //旧版本组装方式 - List commonOrderInvocies = new ArrayList<>(); - CommonOrderInvocieBO commonOrderInvocie = new CommonOrderInvocieBO(); - log.info("==>推送旧的版本接口"); - OrderInvoiceHeadBO orderInvoiceHead = BeanTransitionUtils.transitionOrderInvoiceHead(orderInfo, orderInvoiceInfo); - boolean fpdmhmDp = (OrderInfoEnum.ORDER_INVOICE_TYPE_51.getKey().equals(orderInvoiceInfo.getFpzlDm()) - || OrderInfoEnum.ORDER_INVOICE_TYPE_01.getKey().equals(orderInvoiceInfo.getFpzlDm()) - || OrderInfoEnum.ORDER_INVOICE_TYPE_02.getKey().equals(orderInvoiceInfo.getFpzlDm()) - || OrderInfoEnum.ORDER_INVOICE_TYPE_52.getKey().equals(orderInvoiceInfo.getFpzlDm())) - && StringUtils.isNotEmpty(orderInvoiceInfo.getFphm()); - if (fpdmhmDp) { - /** - * 获取PDF判断 - */ - List fileDownLoadList = orderInvoiceInfoService.getInvoiceFile(orderInfo.getDdlx(), orderInvoiceInfo.getFpzlDm(), orderInvoiceInfo.getPdfUrl(), orderInvoiceInfo.getKplsh(), orderInvoiceInfo.getFpdm(), orderInvoiceInfo.getFphm(), orderInvoiceInfo.getXhfNsrsbh(), terminalCode,""); - if (ObjectUtil.isNotEmpty(fileDownLoadList)) { - orderInvoiceHead.setPDF_FILE(fileDownLoadList.get(0).getFileContent()); - } else { - orderInvoiceHead.setPDF_FILE(""); - } - } else { - orderInvoiceHead.setPDF_FILE(""); - } +// PushReqBO response = new PushReqBO(); +// //旧版本组装方式 +// List commonOrderInvocies = new ArrayList<>(); +// CommonOrderInvocieBO commonOrderInvocie = new CommonOrderInvocieBO(); +// log.info("==>推送旧的版本接口"); +// OrderInvoiceHeadBO orderInvoiceHead = BeanTransitionUtils.transitionOrderInvoiceHead(orderInfo, orderInvoiceInfo); +// boolean fpdmhmDp = (OrderInfoEnum.ORDER_INVOICE_TYPE_51.getKey().equals(orderInvoiceInfo.getFpzlDm()) +// || OrderInfoEnum.ORDER_INVOICE_TYPE_01.getKey().equals(orderInvoiceInfo.getFpzlDm()) +// || OrderInfoEnum.ORDER_INVOICE_TYPE_02.getKey().equals(orderInvoiceInfo.getFpzlDm()) +// || OrderInfoEnum.ORDER_INVOICE_TYPE_52.getKey().equals(orderInvoiceInfo.getFpzlDm())) +// && StringUtils.isNotEmpty(orderInvoiceInfo.getFphm()); +// if (fpdmhmDp) { +// /** +// * 获取PDF判断 +// */ +// List fileDownLoadList = orderInvoiceInfoService.getInvoiceFile(orderInfo.getDdlx(), orderInvoiceInfo.getFpzlDm(), orderInvoiceInfo.getPdfUrl(), orderInvoiceInfo.getKplsh(), orderInvoiceInfo.getFpdm(), orderInvoiceInfo.getFphm(), orderInvoiceInfo.getXhfNsrsbh(), terminalCode,""); +// if (ObjectUtil.isNotEmpty(fileDownLoadList)) { +// orderInvoiceHead.setPDF_FILE(fileDownLoadList.get(0).getFileContent()); +// } else { +// orderInvoiceHead.setPDF_FILE(""); +// } +// } else { +// orderInvoiceHead.setPDF_FILE(""); +// } //组装 - commonOrderInvocie.setORDER_INVOICE_HEAD(orderInvoiceHead); - commonOrderInvocie.setORDER_INVOICE_ITEMS(orderInvoiceItems); - commonOrderInvocies.add(commonOrderInvocie); - - //发票开具状态码 0000 成功 9999 失败 - response.setSTATUS_CODE(OrderInfoContentEnum.PUSH_ENTERPRISE_SUCCESS.getKey()); - response.setSTATUS_MESSAGE(OrderInfoContentEnum.PUSH_ENTERPRISE_SUCCESS.getMessage()); - response.setCOMMON_ORDER_INVOCIE(commonOrderInvocies); - content = JsonUtils.getInstance().toJsonString(response); +// commonOrderInvocie.setORDER_INVOICE_HEAD(orderInvoiceHead); +// commonOrderInvocie.setORDER_INVOICE_ITEMS(orderInvoiceItems); +// commonOrderInvocies.add(commonOrderInvocie); +// +// //发票开具状态码 0000 成功 9999 失败 +// response.setSTATUS_CODE(OrderInfoContentEnum.PUSH_ENTERPRISE_SUCCESS.getKey()); +// response.setSTATUS_MESSAGE(OrderInfoContentEnum.PUSH_ENTERPRISE_SUCCESS.getMessage()); +// response.setCOMMON_ORDER_INVOCIE(commonOrderInvocies); +// content = JsonUtils.getInstance().toJsonString(response); } return content; } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java index 3beb8826..9a3eb18a 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java @@ -32,6 +32,8 @@ public interface OrderProcessService { */ OrderProcessInfo queryOrderProcessInfoByFpqqlsh(String fpqqlsh, List shList); + List queryOrderProcessInfoByBzdh(String bzdh, List shList); + /** * 根据订单请求批次号获取发票处理表数据 * diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java index c7b974ea..6073cd53 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java @@ -64,6 +64,11 @@ public class OrderProcessServiceImpl implements OrderProcessService { //订单与原始订单都需要使用,不能添加有效状态判断 return orderProcessInfoMapper.queryOrderProcessInfoByFpqqlsh(fpqqlsh, shList); } + + @Override + public List queryOrderProcessInfoByBzdh(String bzdh, List shList){ + return orderProcessInfoMapper.queryOrderProcessInfoByBzdh(bzdh, shList); + } @Override public List selectOrderProcessInfoByDdqqpch(String ddqqpch, List shList) { diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index a884704f..5ffc128f 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -3649,6 +3649,7 @@ public class BeanTransitionUtils { if(StringUtils.isNotBlank(ddtxxBO.getXTLY()) && OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(ddtxxBO.getXTLY())){ Map> collect = ddmxList.stream().collect(Collectors.groupingBy(t -> t.getZXBM())); log.info("拆分数据：{}", JSONObject.toJSONString(collect)); + int randomMun = 1; for (Map.Entry> listEntry : collect.entrySet()) { List ddmxxxBOS = listEntry.getValue(); DdzxxBO ddzxxBONew = new DdzxxBO(); @@ -3670,6 +3671,7 @@ public class BeanTransitionUtils { zje = zje.add(new BigDecimal(ddmxxxBO.getJE())); } } + ddtxxBONew.setDDQQLSH(isinput.getSAPKEY() + "0" + randomMun); ddtxxBONew.setHJJE(bhsje.toPlainString()); ddtxxBONew.setHJSE(se.toPlainString()); ddtxxBONew.setJSHJ(zje.toPlainString()); @@ -3678,6 +3680,7 @@ public class BeanTransitionUtils { ddzxxBONew.setDDTXX(ddtxxBONew); ddzxxBONew.setDDMXXX(ddmxLists); ddzxxList.add(ddzxxBONew); + randomMun++; } }else{ diff --git a/order-management-consumer/src/main/resources/download/OrderExcel.xlsx b/order-management-consumer/src/main/resources/download/OrderExcel.xlsx index 94aa0f2955a0d5ea6c972481e28bd144787e2c1f..36bd070dcfaf3e5f14fcdf4683746d54eafe945c 100644 GIT binary patch delta 4436 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 a00000000000002hlV33-2A(be00003b28!p delta 4343 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 diff --git a/order-management-consumer/src/main/resources/download/QdfpImportExcel.xlsx b/order-management-consumer/src/main/resources/download/QdfpImportExcel.xlsx index 3908390d1ff9c25321fc0585d3f30c36c7db85b2..52f3e233909449073a3dffe47953e19bf98fafb3 100644 GIT binary patch delta 1900 zcmV-y2b1`$VcTJ_XA21re3OQT1polwlW+?ie_u}%SrmUK;X5>w_+qlQrL3!l)(5gC z`>-1yc0WKZqcmx!Y-cpOPlHW&|x@UN3OcW&>ek+J>Zc>t_uG#IPZ;}ss#Y>?nUciytp>WVE z;cNJgU7QN@-U)G%=cQo4KH_j(wg}1WgTuG*jgTNQe*rDWX|tmXZ+nCOzyl_A=>p%RH!Skqc}~}; zE;AJ6*`%Of2!(Z_-PlI*j5tPIV|GawSg<=B)UDgxIbz-3Bpw3`kg1TwbG5RCCs7(@QeMZ% zQRRpx%aB{aR7xI2;BZ~b%j%2i?y}8wC@-9>#^&RY9(DP+TCK9lS~N+rHTDT!EGykK za?ad@_OGmHixJvNscDR;B}f#Q(a<|2^A_5Vl;$?179g4;GjZpIo(~OYfA$bB)1l?; zd-EOzLt7OXt|41AnzKEG(OVQBn-R1ydzw3z(gFs3?$Bz9n<{%zbC$)ncG zBzr*HS-RFukH=wlJO=3`e=XLSi~GkgdLh;2x&zWNnTX=SV`v#H%f)A+iIhM*qC4PUnbg^!v*{e~kb93qB1T>3OwZ z)TgqrMcvxt$A8mfaJ3iUz#fR4^iDJOr4s!M-C|^W&51j~dd983Tpp13B2Q1gD0>M^>DW_Phl z7^-cEY%(xF3Egec)~eE8B5MaESuxL7qc4%9sfA65l*|ZWG#y6qX2Rh-m7uCvPzi}33Omc5wh@VA*@m_UV28vNI0Y-N zQ;B2XByC9rV(IyR-uxLk8m@}mdj@T?QpPCg5afa6rO4zwMz`tMA0W?ICI!n&2{BrO zLBr(uDB_CpQp2?_6=<7*@f=AS%2kXO)+&mz;eQJ#nCUo&bmFYk1+(s{=U6fR$mW1U zLi)G>%LKCwS3qCwiD-)ye2-L5IYo*c9z{bhRYw|>E!CBUe(WJbt?`ii3F!y1GA-0HlOdCx7V+amk772 z)nx^9X6(crdzOJXUnisK<$Z*I*Bz|R-Vi}}E)8w6@07dl#V8%4BqTx4Cw-sv(qKS? zGfK!qHTIytO4k&M?eKqzVb>?8et43S0qyo^&~FiUfTYfS_#={U00030{{sL}O9KRx zATS!UC@Ovg2@iaehK2i*#5t0!VlNm260tFY7MK3u5CLEK1FGK-6lf^G4 m1x$OBC1I2BFBJiylLjz80XdUJFg*eNlY=lL2F5J_0001G!>iQ* delta 1872 zcmV-W2e0_sVXR@WXA227=v*&Z1pokUlW+?ie_L-FR}g-;-*u@ToMx-0}1~n**RzT$$ufUd$3tU z)3mnYb*duEV&|MaXU@!-Z@w8uZ~Y#ausz~KqCY6OIp;M8XX6E5aLg|}aC5)@a_74d zf6gXKUSZ5T5fpeg_m~&CTb{vzQBjm^_^u$jxp7IFylJzc62SWj` zgpZ*Ic5yPqd&k6ao|gg>_92Jkx;^0a3!Kdtd?-k6Zg`lpJrw-EJ>+jQfop{GjEa8G zXbAuA;=g-#eE!4s$UA{rIyig^-3ba3e-qGBj5gZ3@V+V$o8+R_ZSHbfc<_Zyh$W6% z(@;&Sg=eIgS6Wj_eF<7Jgb)6KUcTT&Fk}loxaa2X;KzZVuNWS#E3`O6XCl@ae~d0Y zgY^}VTc`+GENk)-BxmVnkwh~z{T528&f~&98uilIPs=wUzXQ(~nSWts6|!sA8S|)> z?I;r7SDG2-+Y%+{0DMaK$k9bbcK9&Kr^P@a< ziA;geL2|2b@P>JjX6w*M!}}?cf8NI+WscObCA+47Pp@ie8Pa7Ef2o$Y@FYsTL`v%z zIjS7iWErw6m`cghFuYsWaC#3$pwfc$#l$lrRzh(f0ik-x) zU1ybMW_cm3lEn^v-Gr4FUx1H`&F5DwHVlm&l5!k@gccJ28^%G3$sj>jOCf1rgbb8+t&MlU2gT(|GNTosn(&%Bp@t5%kK$1nkr=z%u3 zujV`aue&Cbs)UmsK-OkyVV1;YOuX7+3c|aPtoP2l;dBnUhQGi5f5Yvce#UQoM|xT5 z74>Lt=G7-Ef^Ltj&qlG5Ki%8j(cK+`U&{2QnhQs)V zCC%yeur!xEv^hu13y_#U@ujI^KaJ{EVd~^KHcceI?{3I;AG;Mlj=8xToK1Q>iF{TF z-VO?#&Wq82=-QXWe>e3j+CAAB*P*Lzi0&AsJL3wF+R@9bwFtBq&a=*O*~ns`ul6~s zb_NB-t9TyO7#TAG?OB!Ch>*SFc{D*wYwHZo&g$@PZGNT|jJVPwv&U+fdtl#iL@~IC zZIR5PIYs?9;KDeZTB(tjGe@nZ!2!KORVxQjeXdu7scE&mf6kCZZ=4vN5_Z?&&uNym zbu6B$DD7o3jRm2sMrv4IFub*-1&UdvUb>3x9@=5#@>>3|PZ{fa4_L0zsj3=#1JA=y zKGb_78x8U-iCklFK(9J&W=4w+q1iGP=}J98(iJrD>CtI)lqSc>i!F#Qevos>1U|^i zg9CbjW&6UZS}!)I^%K0$M$cDj%q#VoOK1@@t-W}QB-E$xFvPLeWlcK0)njxQ&F*5A zFjQI)-eh2a61vx<%~hqfMAi;TqHLb8Mz)cpsrgL^7tIJ^MumT!UF`UKk>?YW9~>34 z9}$oi1x_lo_FuEKCnf=Z(MrQG6o&5w-=XBbO|r4Mm9_&N!wUz36{mM0IopbDT9RnD z2k=ht6?_V>e4T-hVcKrBL-8`_|Ic^+b4W1RWU2EEN+-Dt5%maiK=NE9auuT6c;=3f zqYaaSrMZLzC$8dHzrAFlzG=|3B4 zrQ^&Jvn}jS`?y`U;EmY2H#%vJWm$S*FQBooaPi!IWt;x5r*4AkMeZba8nf;NNu%tFt#m5ROgbH`x!$UH@Vl&rsAO zbl{SqO9n9=`E=|P@=%RE>aWr@g=|0kUt+KCk~5c%V@myjB@R2p10bq%AODEx8=) K2A3@W00019Vv0ck diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml index 1944d52f..c054f8d5 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml @@ -144,6 +144,32 @@ + +