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())); }); } 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())) {