Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
张松 2025-09-17 17:59:53 +08:00
commit 4710fc4e71
1 changed files with 2 additions and 4 deletions

View File

@ -1347,10 +1347,8 @@ public class ShopSyncServiceImpl implements ShopSyncService {
private void saveCouponsForShops(Map<Long, Long> map, List<Long> ids, ShopCoupon coupon, Long couponId) {
List<Long> couponFoodIds = new ArrayList<>();
if (StrUtil.isNotBlank(coupon.getFoods()) && ",".equals(coupon.getFoods())) {
if (StrUtil.isNotBlank(coupon.getFoods()) && !",".equals(coupon.getFoods())) {
couponFoodIds = Arrays.stream(coupon.getFoods().split(",")).map(Long::parseLong).toList();
}
if (StrUtil.isNotBlank(coupon.getFoods()) && !",".equals(coupon.getFoods())) {
couponFoodIds = Arrays.stream(coupon.getFoods().split(",")).map(Long::parseLong).toList();
}
for (Long id : ids) {
if (CollUtil.isNotEmpty(couponFoodIds)) {