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

merge

Browse Source
This commit is contained in:
Chopper711 2024-06-17 08:31:49 +08:00
commit cb776eb4c0
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java
View File

@ -292,6 +292,9 @@ public class GoodsMessageListener implements RocketMQListener<MessageExt> {
searchParams.setCategoryPath(promotions.getScopeId()); searchParams.setCategoryPath(promotions.getScopeId());
searchParams.setPageNumber(i); searchParams.setPageNumber(i);
searchParams.setPageSize(BATCH_SIZE); searchParams.setPageSize(BATCH_SIZE);
if (CharSequenceUtil.isNotEmpty(promotions.getStoreId()) && !"0".equals(promotions.getStoreId())){
searchParams.setStoreId(promotions.getStoreId());
}
IPage<GoodsSku> goodsSkuByPage = this.goodsSkuService.getGoodsSkuByPage(searchParams); IPage<GoodsSku> goodsSkuByPage = this.goodsSkuService.getGoodsSkuByPage(searchParams);
if (goodsSkuByPage == null || goodsSkuByPage.getRecords().isEmpty()) { if (goodsSkuByPage == null || goodsSkuByPage.getRecords().isEmpty()) {
break; break;

11
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
View File

@ -231,11 +231,20 @@ public class CouponActivityServiceImpl extends AbstractPromotionsServiceImpl<Cou
couponActivities = memberCouponSignService.receiveCoupon(couponActivities); couponActivities = memberCouponSignService.receiveCoupon(couponActivities);
} }
/**
* 自动领取优惠券判定同时，将精准发券功能同时判定
*/
if (couponActivityTrigger.getCouponActivityTypeEnum().equals(CouponActivityTypeEnum.SPECIFY)) {
couponActivities.addAll(memberCouponSignService.receiveCoupon(currentCouponActivity(CouponActivityTypeEnum.SPECIFY.name())));
}
//优惠券发放列表 //优惠券发放列表
List<CouponActivityItemVO> couponActivityItemVOS = new ArrayList<>(); List<CouponActivityItemVO> couponActivityItemVOS = new ArrayList<>();
//准备发放优惠券活动的列表 //准备发放优惠券活动的列表
couponActivities.stream().forEach(item -> couponActivityItemVOS.addAll(item.getCouponActivityItems())); couponActivities.forEach(item -> couponActivityItemVOS.addAll(item.getCouponActivityItems()));
AuthUser authUser = new AuthUser(); AuthUser authUser = new AuthUser();
authUser.setId(couponActivityTrigger.getUserId()); authUser.setId(couponActivityTrigger.getUserId());