From 68e91412eab692251818ff01b067a7e7fd512f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Mon, 8 Dec 2025 17:05:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E6=9C=AA=E4=BF=9D=E5=AD=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/product/service/impl/ConsStockFlowServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java index 25028f713..b9a41b4ae 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java @@ -95,6 +95,7 @@ consStockFlow.setInOutItem(InOutItemEnum.MANUAL_IN.value()); consStockFlow.setCreateUserId(createUserId); consStockFlow.setCreateUserName(createUserName); + consStockFlow.setVendorId(param.getVendorId()); String conId = entity.getConId(); ConsInfo consInfo; if (StrUtil.isBlank(entity.getConId())) { From 8a696ff9e252196dac499cf82e9c30cb71129715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Mon, 8 Dec 2025 17:13:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=99=BA=E6=85=A7=E5=85=85=E5=80=BC?= =?UTF-8?q?=E5=88=B8=E4=B8=8D=E5=AD=98=E5=9C=A8=E4=B8=8D=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/service/impl/MkShopRechargeServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java index 1172116dc..2eafa327e 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java @@ -106,9 +106,11 @@ public class MkShopRechargeServiceImpl extends ServiceImpl couponMap = shopCouponService.list(new QueryWrapper().in(ShopCoupon::getId, couponIdList)).stream().collect(Collectors.toMap(ShopCoupon::getId, v -> v)); couponInfoDTOS.forEach(item -> { ShopCoupon shopCoupon = couponMap.get(item.getId()); - if (shopCoupon != null) { - shopCoupon.setInfo(); + + if (shopCoupon == null) { + return; } + shopCoupon.setInfo(); couponInfoVOS.add(new CouponInfoVO().setCoupon(shopCoupon).setNum(item.getNum())); }); }