caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!183 修复一个可能出现的获取促销信息的bug

Browse Source 
Merge pull request !183 from OceansDeep/feature/pg
This commit is contained in:
OceansDeep 2022-06-07 04:31:08 +00:00 committed by Gitee
commit d53c8362a2
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
framework/src/main/java/cn/lili/modules/promotion/tools/PromotionTools.java
View File

@ -1,5 +1,6 @@
package cn.lili.modules.promotion.tools; package cn.lili.modules.promotion.tools;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.CharSequenceUtil;
@ -159,7 +160,7 @@ public class PromotionTools {
} }
public static Map<String, Object> filterInvalidPromotionsMap(Map<String, Object> map) { public static Map<String, Object> filterInvalidPromotionsMap(Map<String, Object> map) {
if (map == null) { if (CollUtil.isEmpty(map)) {
return new HashMap<>(); return new HashMap<>();
} }
//移除无效促销活动 //移除无效促销活动
@ -173,7 +174,7 @@ public class PromotionTools {
} }
return true; return true;
}).collect(Collectors.toMap(stringObjectEntry -> stringObjectEntry != null ? stringObjectEntry.getKey() : null, stringObjectEntry1 -> stringObjectEntry1 != null ? stringObjectEntry1.getValue() : new BasePromotions())); }).collect(Collectors.toMap(stringObjectEntry -> stringObjectEntry != null ? stringObjectEntry.getKey() : null, stringObjectEntry1 -> stringObjectEntry1 != null ? stringObjectEntry1.getValue() : new BasePromotions(), (oldValue, newValue) -> newValue));
} }
} }