From 0b271788a7b512cd3315200fe09171cfe60399cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Sun, 1 Sep 2024 21:46:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:1.=E6=97=B6=E7=A9=BA=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=90=8E=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=8C2.=E8=AE=A2=E5=8D=95=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=88=A0=E9=99=A4=E5=AF=B9=E5=BA=94=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=B8=AD=E9=97=B4=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/consumer/dao/SkOrderInfoMapper.java | 5 +++++ .../order/consumer/dao/YyOrderInfoMapper.java | 2 ++ .../service/impl/SkOrderServiceImpl.java | 8 +++++--- .../service/impl/YyOrderServiceImpl.java | 6 +++--- .../mybatis/mapper/SkOrderInfoMapper.xml | 20 ++++++++++++++++++- .../mybatis/mapper/YyOrderInfoMapper.xml | 8 +++++++- 6 files changed, 41 insertions(+), 8 deletions(-) diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/dao/SkOrderInfoMapper.java b/order-management-order/src/main/java/com/dxhy/order/consumer/dao/SkOrderInfoMapper.java index de633a2..e0700ee 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/dao/SkOrderInfoMapper.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/dao/SkOrderInfoMapper.java @@ -2,6 +2,7 @@ package com.dxhy.order.consumer.dao; import com.dxhy.order.consumer.modules.bespoke.model.req.ReqParam; import com.dxhy.order.consumer.modules.bespoke.model.sk.SkOrderInfo; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,4 +19,8 @@ public interface SkOrderInfoMapper { //删除订单 int delOrder(ReqParam reqParam); + + SkOrderInfo queryByDdh(ReqParam reqParam); + + int updateStatus( @Param("xsddm") String xsddm, @Param("status") String status); } diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/dao/YyOrderInfoMapper.java b/order-management-order/src/main/java/com/dxhy/order/consumer/dao/YyOrderInfoMapper.java index 6f9deef..72d247f 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/dao/YyOrderInfoMapper.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/dao/YyOrderInfoMapper.java @@ -23,4 +23,6 @@ public interface YyOrderInfoMapper { int updateStatus(@Param("cdlcode") String cdlcode, @Param("status") String status); YyOrderInfo getSaveOrder(String originDdh); + + YyOrderInfo queryByDdh(ReqParam reqParam); } diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java index 05dac11..1d80c33 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java @@ -175,6 +175,8 @@ public class SkOrderServiceImpl implements OrderService { log.debug("V3生成预制返回信息：{}", JSON.toJSONString(ddpcxxRspBO)); String format = String.format(message, skOrderInfo.getXsddm(), ddpcxxRspBO.getZTXX()); if (ddpcxxRspBO.getZTDM().equals(OrderValidateEnum.INVOICE_ERROR_CODE_010000_V3.getKey())) { + //添加状态修改 + skOrderInfoMapper.updateStatus(skOrderInfo.getXsddm(), ConfigureConstant.STRING_1); backMessage.add(com.dxhy.base.common.constant.ConfigureConstant.INT_0, format); } else { backMessage.add(format); @@ -259,9 +261,9 @@ public class SkOrderServiceImpl implements OrderService { @Override public int delOrderByDdh(ReqParam reqParam) { - List skOrderInfoList = skOrderInfoMapper.queryList(reqParam); - if (CollectionUtils.isNotEmpty(skOrderInfoList)){ - reqParam.setIds(Arrays.asList(skOrderInfoList.get(0).getId())); + SkOrderInfo skOrderInfo = skOrderInfoMapper.queryByDdh(reqParam); + if (skOrderInfo != null){ + reqParam.setIds(Arrays.asList(skOrderInfo.getId())); int count = skOrderInfoMapper.delOrder(reqParam); skOrderItemInfoMapper.delOrder(reqParam.getIds()); return count; diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java index 106b606..5f5085b 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java @@ -260,9 +260,9 @@ public class YyOrderServiceImpl implements OrderService { @Override public int delOrderByDdh(ReqParam reqParam) { - List yyOrderInfoList = yyOrderInfoMapper.queryList(reqParam); - if (CollectionUtils.isNotEmpty(yyOrderInfoList)){ - reqParam.setIds(Arrays.asList(yyOrderInfoList.get(0).getId())); + YyOrderInfo yyOrderInfo = yyOrderInfoMapper.queryByDdh(reqParam); + if (yyOrderInfo != null){ + reqParam.setIds(Arrays.asList(yyOrderInfo.getId())); int count = yyOrderInfoMapper.delOrder(reqParam); yyOrderItemInfoMapper.delOrder(reqParam.getIds()); return count; diff --git a/order-management-order/src/main/resources/mybatis/mapper/SkOrderInfoMapper.xml b/order-management-order/src/main/resources/mybatis/mapper/SkOrderInfoMapper.xml index d7d56d0..7805674 100644 --- a/order-management-order/src/main/resources/mybatis/mapper/SkOrderInfoMapper.xml +++ b/order-management-order/src/main/resources/mybatis/mapper/SkOrderInfoMapper.xml @@ -178,10 +178,28 @@ delete from sk_order_info where nsrsbh = #{nsrsbh} and ent_id = #{entId} - and status = '0' and id in #{id} + + + + + update sk_order_info set status = #{status} where xsddm = #{xsddm} + diff --git a/order-management-order/src/main/resources/mybatis/mapper/YyOrderInfoMapper.xml b/order-management-order/src/main/resources/mybatis/mapper/YyOrderInfoMapper.xml index 642cc67..5ae0fae 100644 --- a/order-management-order/src/main/resources/mybatis/mapper/YyOrderInfoMapper.xml +++ b/order-management-order/src/main/resources/mybatis/mapper/YyOrderInfoMapper.xml @@ -211,7 +211,6 @@ delete from yy_order_info where nsrsbh = #{nsrsbh} and ent_id = #{entId} - and status = '0' and id in #{id} @@ -229,4 +228,11 @@ and cdlcode = #{cdlcode} and status = '1' + +