From 1a297840bdde15e97566414c45c982832a96722e Mon Sep 17 00:00:00 2001 From: Tankaikai Date: Tue, 18 Mar 2025 09:47:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=8D=95=E9=80=80=E5=9B=9E=E5=BA=93?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/service/order/service/impl/OrderInfoRpcServiceImpl.java | 2 +- .../czg/service/product/service/impl/ProductRpcServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java index 80e71cab..64cb593f 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java @@ -212,7 +212,7 @@ public class OrderInfoRpcServiceImpl implements OrderInfoRpcService { } try { // 调用商品服务回退库存 - productRpcService.orderRefundReturnStock(orderId, orderInfo.getShopId(), dataList); + productRpcService.orderRefundReturnStock(orderInfo.getShopId(), orderId, dataList); } catch (Exception e) { log.error("调用商品服务回退库存", e); throw e; diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductRpcServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductRpcServiceImpl.java index fb6d9e72..8cc7ee1c 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductRpcServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductRpcServiceImpl.java @@ -78,6 +78,7 @@ public class ProductRpcServiceImpl implements ProductRpcService { flow.setAfterNumber(NumberUtil.sub(NumberUtil.toBigDecimal(product.getStockNumber()), NumberUtil.toBigDecimal(dto.getNum()))); flow.setInOutType(InOutTypeEnum.OUT.value()); flow.setInOutItem(InOutItemEnum.ORDER_OUT.value()); + flow.setOrderId(orderId); productStockFlowMapper.insert(flow); // 查询商品绑定耗材信息 List relationList = prodConsRelationMapper.selectListByQuery(QueryWrapper.create().eq(ProdConsRelation::getProductId, dto.getProductId())); @@ -149,6 +150,7 @@ public class ProductRpcServiceImpl implements ProductRpcService { flow.setAfterNumber(NumberUtil.add(NumberUtil.toBigDecimal(product.getStockNumber()), NumberUtil.toBigDecimal(dto.getNum()))); flow.setInOutType(InOutTypeEnum.IN.value()); flow.setInOutItem(InOutItemEnum.ORDER_IN.value()); + flow.setOrderId(orderId); productStockFlowMapper.insert(flow); // 查询商品绑定耗材信息 List relationList = prodConsRelationMapper.selectListByQuery(QueryWrapper.create().eq(ProdConsRelation::getProductId, dto.getProductId()));