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 a6ccd27cd..a0f994125 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 @@ -150,8 +150,9 @@ public class ProductRpcServiceImpl implements ProductRpcService { flow.setBeforeNumber(NumberUtil.toBigDecimal(product.getStockNumber())); flow.setInOutNumber(NumberUtil.toBigDecimal(dto.getNum())); flow.setAfterNumber(NumberUtil.add(NumberUtil.toBigDecimal(product.getStockNumber()), NumberUtil.toBigDecimal(dto.getNum()))); - flow.setInOutType(InOutTypeEnum.IN.value()); - flow.setInOutItem(InOutItemEnum.ORDER_IN.value()); + flow.setInOutType(InOutTypeEnum.OUT.value()); + flow.setInOutItem(InOutItemEnum.ORDER_OUT.value()); + flow.setRemark("红冲订单取消/退菜/退单消耗的库存"); flow.setOrderId(orderId); productStockFlowService.saveFlow(flow); // 查询商品绑定耗材信息 @@ -180,8 +181,8 @@ public class ProductRpcServiceImpl implements ProductRpcService { // 插入耗材流水记录 ConsStockFlow consStockFlow = new ConsStockFlow(); consStockFlow.setShopId(shopId); - consStockFlow.setInOutType(InOutTypeEnum.IN.value()); - consStockFlow.setInOutItem(InOutItemEnum.ORDER_IN.value()); + consStockFlow.setInOutType(InOutTypeEnum.OUT.value()); + consStockFlow.setInOutItem(InOutItemEnum.ORDER_OUT.value()); consStockFlow.setInOutDate(LocalDate.now()); consStockFlow.setConId(consInfo.getId()); consStockFlow.setConName(consInfo.getConName()); @@ -192,6 +193,7 @@ public class ProductRpcServiceImpl implements ProductRpcService { consStockFlow.setSubTotal(NumberUtil.mul(surplusStock, consInfo.getPrice())); consStockFlow.setProductId(dto.getProductId()); //consStockFlow.setSkuId(0L); + consStockFlow.setRemark("红冲订单取消/退菜/退单消耗的库存"); consStockFlow.setOrderId(orderId); consStockFlowService.saveFlow(consStockFlow); } @@ -223,8 +225,9 @@ public class ProductRpcServiceImpl implements ProductRpcService { flow.setBeforeNumber(NumberUtil.toBigDecimal(product.getStockNumber())); flow.setInOutNumber(NumberUtil.toBigDecimal(dto.getNum())); flow.setAfterNumber(NumberUtil.add(NumberUtil.toBigDecimal(product.getStockNumber()), NumberUtil.toBigDecimal(dto.getNum()))); - flow.setInOutType(InOutTypeEnum.IN.value()); - flow.setInOutItem(InOutItemEnum.ORDER_IN.value()); + flow.setInOutType(InOutTypeEnum.OUT.value()); + flow.setInOutItem(InOutItemEnum.ORDER_OUT.value()); + flow.setRemark("红冲订单取消/退菜/退单消耗的库存"); flow.setOrderId(orderId); productStockFlowService.saveFlow(flow); // 查询商品绑定耗材信息 @@ -253,8 +256,8 @@ public class ProductRpcServiceImpl implements ProductRpcService { // 插入耗材流水记录 ConsStockFlow consStockFlow = new ConsStockFlow(); consStockFlow.setShopId(shopId); - consStockFlow.setInOutType(InOutTypeEnum.IN.value()); - consStockFlow.setInOutItem(InOutItemEnum.ORDER_IN.value()); + consStockFlow.setInOutType(InOutTypeEnum.OUT.value()); + consStockFlow.setInOutItem(InOutItemEnum.ORDER_OUT.value()); consStockFlow.setInOutDate(LocalDate.now()); consStockFlow.setConId(consInfo.getId()); consStockFlow.setConName(consInfo.getConName()); @@ -266,7 +269,7 @@ public class ProductRpcServiceImpl implements ProductRpcService { consStockFlow.setProductId(dto.getProductId()); // consStockFlow.setSkuId(0L); consStockFlow.setOrderId(orderId); - consStockFlow.setRemark("订单退款退菜归还库存"); + consStockFlow.setRemark("红冲订单取消/退菜/退单消耗的库存"); consStockFlowService.saveFlow(consStockFlow); } }