Commit cc5ef03f by 吕明尚

Merge branch 'dev' into test

parents 28b789f7 c5e7c1e1
...@@ -126,7 +126,7 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme ...@@ -126,7 +126,7 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme
sCouponList.stream().forEach(item1 -> { sCouponList.stream().forEach(item1 -> {
if (item.getDealgroupId().equals(item1.getDealgroupId())) { if (item.getDealgroupId().equals(item1.getDealgroupId())) {
if (StringUtils.isNotEmpty(item.getStoreIds())) { if (StringUtils.isNotEmpty(item.getStoreIds())) {
if (item1.getStoreIds().contains(item.getStoreIds())) { if (item1.getStoreIds().equals(item.getStoreIds())) {
return; return;
} else { } else {
SCoupon sCoupon = new SCoupon(); SCoupon sCoupon = new SCoupon();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment