diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java index dc42b26a8..16a3a3468 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java @@ -10,6 +10,7 @@ import com.mybatisflex.spring.service.impl.ServiceImpl; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -27,6 +28,10 @@ public class BkContactListServiceImpl extends ServiceImpl getUserList(Long shopId, Set phones) { + if (phones == null || phones.isEmpty()) { + return new ArrayList<>(); + } + remove(QueryWrapper.create().eq(BkContactList::getShopId, shopId)); List collect = phones.stream() .filter(StrUtil::isNotEmpty) 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 ddcd690fe..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())) { @@ -121,7 +122,9 @@ consInfo.setStockNumber(consStockFlow.getAfterNumber()); updateStockList.add(consInfo); } - mapper.insertBatchSelective(insertList, 50); + if (!insertList.isEmpty()) { + mapper.insertBatchSelective(insertList, 50); + } for (ConsInfo consInfo : updateStockList) { consInfoMapper.update(consInfo); }