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

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

Browse Source
This commit is contained in:
Chopper 2021-12-23 11:58:53 +08:00
commit a3d2b84ecb
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java
View File

@ -521,7 +521,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
private LambdaUpdateWrapper<Goods> getUpdateWrapperByStoreAuthority() { private LambdaUpdateWrapper<Goods> getUpdateWrapperByStoreAuthority() {
LambdaUpdateWrapper<Goods> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<Goods> updateWrapper = new LambdaUpdateWrapper<>();
AuthUser authUser = this.checkStoreAuthority(); AuthUser authUser = this.checkStoreAuthority();
updateWrapper.eq(Goods::getStoreId, authUser.getStoreId()); if (authUser != null) {
updateWrapper.eq(Goods::getStoreId, authUser.getStoreId());
}
return updateWrapper; return updateWrapper;
} }
@ -563,7 +565,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
private LambdaUpdateWrapper<Goods> getUpdateWrapperByManagerAuthority() { private LambdaUpdateWrapper<Goods> getUpdateWrapperByManagerAuthority() {
LambdaUpdateWrapper<Goods> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<Goods> updateWrapper = new LambdaUpdateWrapper<>();
AuthUser authUser = this.checkStoreAuthority(); AuthUser authUser = this.checkStoreAuthority();
updateWrapper.eq(Goods::getStoreId, authUser.getStoreId()); if (authUser != null) {
updateWrapper.eq(Goods::getStoreId, authUser.getStoreId());
}
return updateWrapper; return updateWrapper;
} }
@ -575,7 +579,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
private LambdaQueryWrapper<Goods> getQueryWrapperByStoreAuthority() { private LambdaQueryWrapper<Goods> getQueryWrapperByStoreAuthority() {
LambdaQueryWrapper<Goods> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Goods> queryWrapper = new LambdaQueryWrapper<>();
AuthUser authUser = this.checkStoreAuthority(); AuthUser authUser = this.checkStoreAuthority();
queryWrapper.eq(Goods::getStoreId, authUser.getStoreId()); if (authUser != null) {
queryWrapper.eq(Goods::getStoreId, authUser.getStoreId());
}
return queryWrapper; return queryWrapper;
} }

9
framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java
View File

@ -144,16 +144,13 @@ public class SkuPromotionRender implements CartRenderStep {
/** /**
* 购物车促销类型 * 购物车促销类型
*/ */
private Boolean ignorePromotion(String promotionKey) { private boolean ignorePromotion(String promotionKey) {
// 忽略积分活动活动 忽略砍价活动 忽略优惠券活动 忽略拼团活动 // 忽略积分活动活动 忽略砍价活动 忽略优惠券活动 忽略拼团活动
if (promotionKey.contains(PromotionTypeEnum.POINTS_GOODS.name()) return promotionKey.contains(PromotionTypeEnum.POINTS_GOODS.name())
|| promotionKey.contains(PromotionTypeEnum.KANJIA.name()) || promotionKey.contains(PromotionTypeEnum.KANJIA.name())
|| promotionKey.contains(PromotionTypeEnum.COUPON.name()) || promotionKey.contains(PromotionTypeEnum.COUPON.name())
|| promotionKey.contains(PromotionTypeEnum.PINTUAN.name())) { || promotionKey.contains(PromotionTypeEnum.PINTUAN.name());
return true;
}
return false;
} }
} }