|
|
@@ -1002,6 +1002,19 @@ public class GoodsDonController {
|
|
|
UserSharedDto userSharedDto = userService.getUserShredDtoByDsCode(dsCode);
|
|
|
dsUserId.set(userSharedDto.getSharedId());
|
|
|
}
|
|
|
+ AtomicBoolean filterCourseGoods = new AtomicBoolean(false);
|
|
|
+ //增值服务分类
|
|
|
+ if (fUid != null && cgy != null && (cgy == 3 || cgy == 4)) {
|
|
|
+ //GPT Plus基础2月 课程不展示
|
|
|
+ List<Long> userIdList = userBindRelationService.getRelationUserIdList(fUid, null);
|
|
|
+ Integer orders = orderDonMapper.selectCount(Wrappers.lambdaQuery(OrderDon.class)
|
|
|
+ .in(OrderDon::getUserId, userIdList)
|
|
|
+ .eq(OrderDon::getSkuId, 444)
|
|
|
+ .notIn(OrderDon::getStatus, Constant.noOrderStatus));
|
|
|
+ if (orders > 0) {
|
|
|
+ filterCourseGoods.set(true);
|
|
|
+ }
|
|
|
+ }
|
|
|
goodsFrontListViews = goodsFrontListViews.stream().filter(data -> {
|
|
|
if (data.getIsOwns()) {
|
|
|
if (dsUserId.get() == 0 && fUid != null && existsChannel.get()) {
|
|
|
@@ -1019,6 +1032,10 @@ public class GoodsDonController {
|
|
|
data.setMonths(minPriceUserOwnsSku.getMonths());
|
|
|
data.setDays(minPriceUserOwnsSku.getDays());
|
|
|
}
|
|
|
+ //课件类型 且过滤
|
|
|
+ if (filterCourseGoods.get() && data.getSpecialType() == GoodsDon.SpecialType.courseware) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
//设置特定价格
|
|
|
setGcSpecificPrice(data, fUid, dsUserId.get());
|
|
|
return true;
|