From 1db98ecd43312cb0ec23fa42b6a35c5dd86fdb01 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Thu, 18 May 2023 09:14:13 +0800 Subject: [PATCH 1/8] =?UTF-8?q?feature=201.=E4=BF=AE=E5=A4=8D=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF=E5=8F=96=E5=80=BC=E4=B8=8D=E5=AF=B9?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../openapi/protocol/v6/sdenergy/MdmSyncUserReqBO.java | 9 +++++++++ .../openapi/service/impl/SDEnregyServiceImpl.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmSyncUserReqBO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmSyncUserReqBO.java index 6b95ff17..9efe18e2 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmSyncUserReqBO.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmSyncUserReqBO.java @@ -34,12 +34,21 @@ public class MdmSyncUserReqBO { // 人员状态的值 private String DESC59; + private String DESC4; // UUID的值 private String UUID; private Boolean success; + public String getDESC4() { + return DESC4; + } + + public void setDESC4(String DESC4) { + this.DESC4 = DESC4; + } + public void setCODE(String CODE) { this.CODE = CODE; } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java index 93359b44..a2973f0c 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java @@ -476,7 +476,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { .code(mdmSyncUserReqBO.getCODE()) // 用户编码 .email(mdmSyncUserReqBO.getDESC11()) // 电子邮箱 .companyCode(mdmSyncUserReqBO.getDESC37()) // 公司编码 - .userStatus(mdmSyncUserReqBO.getDESC59()) // 员工状态 0离职、1离岗、2退休、3在岗、4死亡 + .userStatus(mdmSyncUserReqBO.getDESC4()) // 员工状态 0离职、1离岗、2退休、3在岗、4死亡 .password("Sdny@"+mdmSyncUserReqBO.getCODE()) .dataSource("1") .build(); From fbe3b57fb82457045a578f83a578fdc170befe43 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Thu, 18 May 2023 11:41:31 +0800 Subject: [PATCH 2/8] =?UTF-8?q?feature=201.=E5=95=86=E5=93=81=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E8=B6=85=E8=BF=8790=E4=BD=8D=E5=88=99=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=88=AA=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumer/utils/BeanTransitionUtils.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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 bfc8cea9..d7896c1a 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 @@ -57,6 +57,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; +import java.io.IOException; import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.*; @@ -3525,6 +3526,21 @@ public class BeanTransitionUtils { } ddmxxxBO.setZXBM(detail.getMATNR()); ddmxxxBO.setXMMC(detail.getZCPMC()); + if(StringUtils.isNotBlank(ddmxxxBO.getXMMC())){ + String xmmc = ddmxxxBO.getXMMC(); + try { + if (xmmc.getBytes(ConfigureConstant.STRING_CHARSET_GBK).length > ConfigureConstant.INT_90) { + log.debug("对明细行商品名称进行截取,截取前数据为:{}", xmmc); + xmmc = StringUtil.subStringByByte(xmmc, ConfigureConstant.INT_90); + log.debug("对明细行商品名称进行截取,截取后数据为:{}", xmmc); + ddmxxxBO.setXMMC(xmmc); + } + } catch (IOException e) { + //编码格式错误 + log.error("处理商品名称异常", e); + throw new RuntimeException(e); + } + } if(ConfigureConstant.STRING_1.equals(ddmxxxBO.getFPHXZ())){ ddmxxxBO.setGGXH(""); ddmxxxBO.setDW(""); From 27ea8d5ffac8aeefac20bbd7bb0edc2486629918 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Thu, 18 May 2023 14:20:16 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feature=201.=E5=8F=91=E7=A5=A8=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E7=9F=BF=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/order/consumer/utils/BeanTransitionUtils.java | 2 +- .../module/invoice/model/excel/ExportInvoiceItemInfo.java | 3 ++- .../invoice/model/excel/ExportInvoiceItemInfoEnum.java | 8 ++++++-- .../invoice/service/impl/OrderInvoiceInfoServiceImpl.java | 1 + 4 files changed, 10 insertions(+), 4 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 d7896c1a..cbd2dfb1 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 @@ -3537,7 +3537,7 @@ public class BeanTransitionUtils { } } catch (IOException e) { //编码格式错误 - log.error("处理商品名称异常", e); + log.error("处理商品名称异常：{}", e); throw new RuntimeException(e); } } diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/excel/ExportInvoiceItemInfo.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/excel/ExportInvoiceItemInfo.java index 35faec93..558fa6fb 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/excel/ExportInvoiceItemInfo.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/excel/ExportInvoiceItemInfo.java @@ -50,6 +50,7 @@ public class ExportInvoiceItemInfo implements Serializable { * 商品编码 */ private String spbm; - + private String kb; + } diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/excel/ExportInvoiceItemInfoEnum.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/excel/ExportInvoiceItemInfoEnum.java index 833270a2..771ad519 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/excel/ExportInvoiceItemInfoEnum.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/excel/ExportInvoiceItemInfoEnum.java @@ -48,8 +48,12 @@ public enum ExportInvoiceItemInfoEnum { EXCEL_EXPORT_INVOICE_SL("30", "sl", "税率"), EXCEL_EXPORT_INVOICE_SE("31", "se", "税额"), EXCEL_EXPORT_INVOICE_SPBM("32", "spbm", "税收分类编码"), - EXCEL_EXPORT_INVOICE_BMBBBH("33", "bmbbbh", "编码表版本号"), - EXCEL_EXPORT_INVOICE_ITEM("34", "exportInvoiceItemInfoList", "数组"); + EXCEL_EXPORT_INVOICE_KB("33", "kb", "矿别"), + EXCEL_EXPORT_INVOICE_BMBBBH("34", "bmbbbh", "编码表版本号"), + EXCEL_EXPORT_INVOICE_ITEM("35", "exportInvoiceItemInfoList", "数组") + + + ; /** * key diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java index 04de7d46..ffbe8e45 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java @@ -664,6 +664,7 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService { exportInvoiceItemInfo.setSl(StringUtils.isNotBlank(orderItemInfo.getSl()) ? orderItemInfo.getSl() : ""); exportInvoiceItemInfo.setSe(StringUtils.isNotBlank(orderItemInfo.getSe()) ? orderItemInfo.getSe() : ""); exportInvoiceItemInfo.setSpbm(StringUtils.isNotBlank(orderItemInfo.getSpbm()) ? orderItemInfo.getSpbm() : ""); + exportInvoiceItemInfo.setKb(StringUtils.isNotBlank(orderItemInfo.getKb()) ? orderItemInfo.getKb() : ""); exportInvoiceItemInfoList.add(exportInvoiceItemInfo); } From 34f9de750e9c1e0987f8710f2191ebe72b3bbe3d Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Thu, 18 May 2023 15:22:17 +0800 Subject: [PATCH 4/8] =?UTF-8?q?feature=201.=E5=8C=B9=E9=85=8D=E5=90=8E?= =?UTF-8?q?=E7=9A=84=E5=95=86=E5=93=81=E5=90=8D=E7=A7=B0=E5=A4=A7=E4=BA=8E?= =?UTF-8?q?90=E4=BD=8D=E8=BF=9B=E8=A1=8C=E6=88=AA=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CommonInterfaceServiceImpl.java | 18 +++++++++++++++++- .../consumer/utils/BeanTransitionUtils.java | 16 ---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java index 3b1a06f9..3e71a90e 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java @@ -46,6 +46,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.*; @@ -773,7 +774,22 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService { } item.setXmmc(spmc); - //发票行性质为折扣行,不补全,单价,数量,单位,规格型号 + if(StringUtils.isNotBlank(item.getXmmc())){ + String xmmc = item.getXmmc(); + try { + if (xmmc.getBytes(ConfigureConstant.STRING_CHARSET_GBK).length > ConfigureConstant.INT_90) { + log.debug("对明细行商品名称进行截取,截取前数据为:{}", xmmc); + xmmc = StringUtil.subStringByByte(xmmc, ConfigureConstant.INT_90); + log.debug("对明细行商品名称进行截取,截取后数据为:{}", xmmc); + item.setXmmc(xmmc); + } + } catch (IOException e) { + //编码格式错误 + log.error("处理商品名称异常：{}", e); + throw new RuntimeException(e); + } + } + //发票行性质为折扣行,不补全,单价,数量,单位,规格型号 if (!OrderInfoEnum.FPHXZ_CODE_1.getKey().equals(item.getFphxz())) { //规格型号 if (StringUtils.isBlank(item.getGgxh()) && StringUtils.isNotBlank(commodity.getGgxh())) { 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 cbd2dfb1..bfc8cea9 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 @@ -57,7 +57,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; -import java.io.IOException; import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.*; @@ -3526,21 +3525,6 @@ public class BeanTransitionUtils { } ddmxxxBO.setZXBM(detail.getMATNR()); ddmxxxBO.setXMMC(detail.getZCPMC()); - if(StringUtils.isNotBlank(ddmxxxBO.getXMMC())){ - String xmmc = ddmxxxBO.getXMMC(); - try { - if (xmmc.getBytes(ConfigureConstant.STRING_CHARSET_GBK).length > ConfigureConstant.INT_90) { - log.debug("对明细行商品名称进行截取,截取前数据为:{}", xmmc); - xmmc = StringUtil.subStringByByte(xmmc, ConfigureConstant.INT_90); - log.debug("对明细行商品名称进行截取,截取后数据为:{}", xmmc); - ddmxxxBO.setXMMC(xmmc); - } - } catch (IOException e) { - //编码格式错误 - log.error("处理商品名称异常：{}", e); - throw new RuntimeException(e); - } - } if(ConfigureConstant.STRING_1.equals(ddmxxxBO.getFPHXZ())){ ddmxxxBO.setGGXH(""); ddmxxxBO.setDW(""); From ad74101a7db80803ed078db82c34972f01b63f76 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Fri, 19 May 2023 14:29:01 +0800 Subject: [PATCH 5/8] =?UTF-8?q?feature=201.=E4=BF=AE=E5=A4=8D=E5=B7=B2?= =?UTF-8?q?=E6=8B=86=E5=88=86=E5=B7=B2=E5=BC=80=E7=A5=A8=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=BF=94=E5=9B=9Esap=E9=94=99=E8=AF=AF=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/OrderProcessService.java | 5 ++++- .../service/impl/OrderProcessServiceImpl.java | 16 ++++++++++------ .../AllocateInvoiceInterfaceServiceImplV3.java | 14 ++++++++++++++ .../service/impl/InterfaceServiceImplV6.java | 3 +-- 4 files changed, 29 insertions(+), 9 deletions(-) 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 17e5aa43..749653e1 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 @@ -1,8 +1,8 @@ package com.dxhy.order.consumer.modules.order.service; +import com.dxhy.order.consumer.modules.order.model.bo.YwlxCountTotalBO; import com.dxhy.order.model.OrderProcessInfo; import com.dxhy.order.model.PageUtils; -import com.dxhy.order.consumer.modules.order.model.bo.YwlxCountTotalBO; import java.util.List; import java.util.Map; @@ -51,6 +51,9 @@ public interface OrderProcessService { */ PageUtils selectOrderInfo(Map map, List shList, List entList); + + List queryOrderInfo(Map map, List shList, List entList); + /** * 更新开票状态 * 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 8f8d297b..bcd1c274 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 @@ -1,22 +1,21 @@ package com.dxhy.order.consumer.modules.order.service.impl; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.dxhy.order.baseservice.module.thirdservice.user.model.DeptEntity; import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService; import com.dxhy.order.constant.ConfigureConstant; import com.dxhy.order.constant.OrderInfoEnum; -import com.dxhy.order.model.OrderInvoiceInfo; -import com.dxhy.order.model.OrderProcessInfo; -import com.dxhy.order.model.OrderProcessInfoExt; -import com.dxhy.order.model.PageUtils; import com.dxhy.order.consumer.dao.OrderProcessInfoExtMapper; import com.dxhy.order.consumer.dao.OrderProcessInfoMapper; import com.dxhy.order.consumer.modules.order.model.bo.YwlxCountBO; import com.dxhy.order.consumer.modules.order.model.bo.YwlxCountTotalBO; import com.dxhy.order.consumer.modules.order.service.OrderProcessService; import com.dxhy.order.invoice.module.invoice.service.OrderInvoiceInfoService; +import com.dxhy.order.model.OrderInvoiceInfo; +import com.dxhy.order.model.OrderProcessInfo; +import com.dxhy.order.model.OrderProcessInfoExt; +import com.dxhy.order.model.PageUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -92,7 +91,12 @@ public class OrderProcessServiceImpl implements OrderProcessService { return new PageUtils(pageInfo.getList(), (int) pageInfo.getTotal(), pageInfo.getPageSize(), pageInfo.getPageNum()); } - + + @Override + public List queryOrderInfo(Map map, List shList, List entList) { + return orderProcessInfoMapper.queryOrderInfo(map, shList, entList); + } + @Override @Transactional(rollbackFor = Exception.class) public boolean updateKpzt(String fpqqlsh, String ddzt, String kpzt, String sbyy, String sld, String sldMc, String fjh, List shList) { diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java index 71bc18c7..d07e89dd 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java @@ -48,6 +48,7 @@ import com.dxhy.order.utils.CommonUtils; import com.dxhy.order.utils.DecimalCalculateUtil; import com.dxhy.order.utils.JsonUtils; import com.dxhy.order.utils.NsrsbhUtils; +import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; @@ -57,6 +58,7 @@ import javax.annotation.Resource; import java.io.UnsupportedEncodingException; import java.text.DecimalFormat; import java.util.*; +import java.util.stream.Collectors; /** * 订单对外接口业务实现类-发票开具接口 @@ -1244,6 +1246,18 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt //校验请求流水号是否重复 if (ObjectUtil.isNotNull(selectOrderProcessInfo)) { if (OrderInfoEnum.DATE_DELETE_STATUS_1.getKey().equals(selectOrderProcessInfo.getOrderStatus())) { + Map map = Maps.newHashMap(); + map.put("originOrderId",selectOrderProcessInfo.getOrderInfoId()); + map.put("orderStatus",OrderInfoEnum.DATE_DELETE_STATUS_0.getKey()); + List processInfos = orderProcessService.queryOrderInfo(map, null, null); + if(processInfos != null && !processInfos.isEmpty()){ + //证明是拆分的订单 + List invalidList = orderInvoiceInfoService.countInoviceInfo(processInfos.stream().map(OrderProcessInfo::getOrderInfoId).collect(Collectors.toList())); + if(invalidList != null && !invalidList.isEmpty() && invalidList.size() != processInfos.size()){ + log.error("{}证明是拆分的订单,请求流水号已存在!订单ID为:{},流水号为:{}", LOGGER_MSG, selectOrderProcessInfo.getOrderInfoId(), ddqqlsh); + throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_ERROR_CODE_010002_V3); + } + } throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_ERROR_CODE_010015_V3); } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java index a9f16093..cc0f67dc 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java @@ -10,9 +10,7 @@ import com.dxhy.order.consumer.constant.InterfaceNameEnum; import com.dxhy.order.consumer.dao.InterfaceRequestDataMapper; import com.dxhy.order.consumer.dao.OrderProcessInfoMapper; import com.dxhy.order.consumer.model.page.PageRequestVO; -import com.dxhy.order.consumer.modules.order.controller.OrderInvoiceController; import com.dxhy.order.consumer.modules.order.service.OrderInfoService; -import com.dxhy.order.consumer.modules.order.service.OrderProcessService; import com.dxhy.order.consumer.openapi.protocol.po.EsOutput; import com.dxhy.order.consumer.openapi.protocol.po.IsInput; import com.dxhy.order.consumer.openapi.protocol.po.PoCommonRequestParam; @@ -154,6 +152,7 @@ public class InterfaceServiceImplV6 implements InterfaceServiceV6 { poCommonResponseParam.setES_OUTPUT(esOutput); return poCommonResponseParam; } + //拆分或者页面逻辑删除的订单也需要重新修改流水号，否则进不来 // List collect = orderProcessInfos.stream().filter(t -> "0".equals(t.getOrderStatus())).collect(Collectors.toList()); // if(collect.isEmpty()){ From 9fa00657a823bb27b782e5b9dc0cad52adee75b2 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Fri, 19 May 2023 16:59:10 +0800 Subject: [PATCH 6/8] =?UTF-8?q?feature=201.=E8=BF=94=E5=9B=9E=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AllocateInvoiceInterfaceServiceImplV3.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java index d07e89dd..d69a7544 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java @@ -1253,7 +1253,12 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt if(processInfos != null && !processInfos.isEmpty()){ //证明是拆分的订单 List invalidList = orderInvoiceInfoService.countInoviceInfo(processInfos.stream().map(OrderProcessInfo::getOrderInfoId).collect(Collectors.toList())); - if(invalidList != null && !invalidList.isEmpty() && invalidList.size() != processInfos.size()){ + List infos = processInfos.stream().filter(p -> (OrderInfoEnum.ORDER_STATUS_5.getKey().equals(p.getDdzt()) || OrderInfoEnum.ORDER_STATUS_7.getKey().equals(p.getDdzt()))).collect(Collectors.toList()); + if(infos != null && infos.size() == processInfos.size()){ + log.error("{}证明是拆分的订单 已开票/已冲红,请求流水号已存在!订单ID为:{},流水号为:{}", LOGGER_MSG, selectOrderProcessInfo.getOrderInfoId(), ddqqlsh); + throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_ERROR_CODE_010002_V3); + } + if(invalidList != null && invalidList.size() == processInfos.size()){ log.error("{}证明是拆分的订单,请求流水号已存在!订单ID为:{},流水号为:{}", LOGGER_MSG, selectOrderProcessInfo.getOrderInfoId(), ddqqlsh); throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_ERROR_CODE_010002_V3); } From 535fd0d559af1bd8490fd62c274620293ff4674a Mon Sep 17 00:00:00 2001 From: gaorl Date: Sun, 21 May 2023 11:02:20 +0800 Subject: [PATCH 7/8] =?UTF-8?q?feature=EF=BC=9A=E9=87=8D=E5=A4=8D=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E=E7=9A=84=E8=AE=A2=E5=8D=95=E4=B8=8D=E5=86=8D=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=B5=81=E6=B0=B4=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/OrderInfoServiceImpl.java | 13 +++++++++---- 1 file changed, 9 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 5da67c2f..ee4d97ec 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 @@ -1726,26 +1726,31 @@ public class OrderInfoServiceImpl implements OrderInfoService { } String orderInfoId = pageRequest.getOrderInfoId(); String issuedSign = pageRequest.getIssuedSign(); + String fpqqlsh = pageRequest.getFpqqlsh(); + if(fpqqlsh.contains("-bh")){ + continue; + } List shList = Arrays.asList(pageRequest.getXhfNsrsbh()); + //todo 此处随机值可以采用有序递增，但是判断较为麻烦点 int i1 = new Random().nextInt(100); OrderProcessInfo orderProcessInfo = new OrderProcessInfo(); orderProcessInfo.setOrderInfoId(orderInfoId); orderProcessInfo.setOrderStatus(ConfigureConstant.STRING_1); orderProcessInfo.setBhzt(ConfigureConstant.STRING_1); - orderProcessInfo.setFpqqlsh(pageRequest.getFpqqlsh() + "-bh" + i1); - orderProcessInfo.setDdqqpch(pageRequest.getFpqqlsh() + "-bh" + i1); + orderProcessInfo.setFpqqlsh(fpqqlsh + "-bh" + i1); + orderProcessInfo.setDdqqpch(fpqqlsh + "-bh" + i1); orderProcessInfo.setUpdateTime(new Date()); if(ConfigureConstant.STRING_0.equals(issuedSign)){ OrderInvoiceInfo orderInvoiceInfo = new OrderInvoiceInfo(); orderInvoiceInfo.setOrderInfoId(orderInfoId); - orderInvoiceInfo.setFpqqlsh(pageRequest.getFpqqlsh() + "-bh"+ i1); + orderInvoiceInfo.setFpqqlsh(fpqqlsh + "-bh"+ i1); orderProcessInfo.setOrderStatus(ConfigureConstant.STRING_0); orderInvoiceInfoMapper.updateOrderInvoiceInfoByOrderId(orderInvoiceInfo,null); } int success = orderProcessService.updateOrderProcessInfoByProcessId(orderProcessInfo, shList); OrderInfo orderInfo = new OrderInfo(); orderInfo.setId(orderInfoId); - orderInfo.setFpqqlsh(pageRequest.getFpqqlsh() + "-bh"+ i1); + orderInfo.setFpqqlsh(fpqqlsh + "-bh"+ i1); orderInfo.setUpdateTime(new Date()); orderMapper.updateOrderInfoByOrderId(orderInfo,shList); From 627675814d6aa06013145c3acaef8ccc9a76a801 Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 22 May 2023 15:27:36 +0800 Subject: [PATCH 8/8] =?UTF-8?q?feature=EF=BC=9A=E5=85=81=E8=AE=B8=E6=89=8B?= =?UTF-8?q?=E5=B7=A5=E5=8B=BE=E9=80=89=E7=89=A9=E6=96=99=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxclass/dao/TaxClassCodeMapper.java | 7 +++ .../mybatis/mapper/TaxClassCodeMapper.xml | 14 ++++++ .../order/controller/OrderInfoController.java | 14 ++++-- .../order/service/OrderInfoService.java | 2 +- .../service/impl/OrderInfoServiceImpl.java | 50 ++++++++----------- 5 files changed, 54 insertions(+), 33 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/TaxClassCodeMapper.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/TaxClassCodeMapper.java index e6f2ee2b..85a01184 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/TaxClassCodeMapper.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/TaxClassCodeMapper.java @@ -23,6 +23,13 @@ public interface TaxClassCodeMapper { TaxClassCodeEntity selectTaxClassCodeBySpbm(@Param("spbm") String spbm); + /** + * 根据税收编码统计数 + * @param spbms + * @return + */ + Integer countTaxClassCodeBySpbm(@Param("spbms") List spbms,@Param("map")Map map); + List selectTaxClassCodeBySpmcOrSm(String queryString); diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml index 2a0bcf45..c78910a8 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml @@ -44,6 +44,20 @@ where tcc.spbm = #{spbm} limit 1 + +