Merge branch 'prod' into test

This commit is contained in:
gong
2025-12-09 09:22:38 +08:00
3 changed files with 13 additions and 3 deletions

View File

@@ -106,9 +106,11 @@ public class MkShopRechargeServiceImpl extends ServiceImpl<MkShopRechargeMapper,
Map<Long, ShopCoupon> 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()));
});
}