Merge branch 'prod' into test
This commit is contained in:
@@ -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()));
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user