From a72bf3cede6c048990bbbc9ddc42ef239a162cf0 Mon Sep 17 00:00:00 2001 From: gaorl Date: Wed, 26 Apr 2023 11:29:06 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=8F=91=E7=A5=A8=E5=BC=80?= =?UTF-8?q?=E5=85=B7=E5=90=8E=E4=BF=9D=E5=AD=98=E7=89=A9=E6=96=99=E7=BC=96?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E4=B8=94=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=99=BA=E8=83=BD=E8=B5=8B=E7=A0=81=E4=B8=BA=E9=9D=9E=E6=99=BA?= =?UTF-8?q?=E8=83=BD=E8=B5=8B=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commodity/service/impl/CommodityServiceImpl.java | 2 +- .../config/rabbitmq/OrderSaveSpxxHandler.java | 11 ++++++++++- .../modules/order/service/OrderItemInfoService.java | 3 +++ .../order/service/impl/OrderItemInfoServiceImpl.java | 6 ++++++ .../resources/mybatis/mapper/OrderItemInfoMapper.xml | 3 +++ 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java index d280b604..a29213f3 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java @@ -622,7 +622,7 @@ public class CommodityServiceImpl implements CommodityService { Map map = new HashMap<>(); // map.put("productName", xmmc); map.put("zxbm", receiveSpxxReq.getZxbm()); - map.put("entId",commodityCodeCheckQuery.getDeptId()); + map.put("entId",receiveSpxxReq.getEntId()); log.debug("{}校验名称是否存在 参数:{}", LOGGER_MSG, map); List commodityCodeEntityList = commodityMapper.queryProductList(map, null); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java index c366fbdb..dcec492d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java @@ -111,7 +111,7 @@ public class OrderSaveSpxxHandler implements BaseListener { List shList = NsrsbhUtils.transShListByNsrsbh(orderInvoiceInfo.getXhfNsrsbh()); List orderItemInfoList = orderItemInfoService.selectOrderItemInfoByOrderId(orderInvoiceInfo.getOrderInfoId(), shList); - + List updateZnfmList = new ArrayList<>(); if (ObjectUtil.isNotEmpty(orderItemInfoList)) { List receiveSpxxReqList = new ArrayList<>(); for (OrderItemInfo orderItemInfo : orderItemInfoList) { @@ -120,8 +120,17 @@ public class OrderSaveSpxxHandler implements BaseListener { receiveSpxxReq.setXhfMc(orderInvoiceInfo.getXhfMc()); receiveSpxxReq.setEntId(userInfoService.getUser() != null ? userInfoService.getUser().getDeptId():orderInvoiceInfo.getEntId()); receiveSpxxReqList.add(receiveSpxxReq); + //更新是否为只能赋码 + if("1".equals(orderItemInfo.getZnfm())){ + OrderItemInfo orderItemInfo1 = new OrderItemInfo(); + orderItemInfo1.setId(orderItemInfo.getId()); + orderItemInfo1.setZnfm("0"); + updateZnfmList.add(orderItemInfo1); + } } + //事务控制 commodityService.saveCommodityCodeEntity(receiveSpxxReqList); + orderItemInfoService.updateOrderItemId(updateZnfmList); } } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderItemInfoService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderItemInfoService.java index 4e323139..5428abf0 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderItemInfoService.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderItemInfoService.java @@ -1,6 +1,7 @@ package com.dxhy.order.consumer.modules.order.service; import com.dxhy.order.model.OrderItemInfo; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -38,4 +39,6 @@ public interface OrderItemInfoService { */ int insertOrderItemByList(List orderItemInfos); + int updateOrderItemId(List resultOrderItemList); + } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderItemInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderItemInfoServiceImpl.java index bc51528c..cb4a097e 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderItemInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderItemInfoServiceImpl.java @@ -3,6 +3,7 @@ package com.dxhy.order.consumer.modules.order.service.impl; import com.dxhy.order.model.OrderItemInfo; import com.dxhy.order.consumer.modules.order.service.OrderItemInfoService; import com.dxhy.order.invoice.module.invoice.dao.OrderItemInfoMapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -35,4 +36,9 @@ public class OrderItemInfoServiceImpl implements OrderItemInfoService { return orderItemInfoMapper.insertOrderItemByList(orderItemInfos); } + @Override + public int updateOrderItemId(@Param("list") List resultOrderItemList){ + return orderItemInfoMapper.updateOrderItemId(resultOrderItemList); + } + } diff --git a/order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml b/order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml index 8a683178..3f582aad 100644 --- a/order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml +++ b/order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml @@ -283,6 +283,9 @@ xmdw = #{item.xmdw,jdbcType=VARCHAR}, + + znfm = #{item.znfm,jdbcType=VARCHAR}, + id = #{item.id,jdbcType=VARCHAR}