diff --git a/src/main/java/com/peanut/modules/sociology/controller/UserController.java b/src/main/java/com/peanut/modules/sociology/controller/UserController.java index 12f96364..725b2020 100644 --- a/src/main/java/com/peanut/modules/sociology/controller/UserController.java +++ b/src/main/java/com/peanut/modules/sociology/controller/UserController.java @@ -1,6 +1,9 @@ package com.peanut.modules.sociology.controller; +import com.peanut.common.utils.R; +import com.peanut.modules.sociology.service.VipService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -8,6 +11,12 @@ import org.springframework.web.bind.annotation.RestController; @RestController("sociologyUser") @RequestMapping("sociology/user") public class UserController { + @Autowired + private VipService vipService; + @RequestMapping("/getVipProductForUser") + public R getVipProductForUser(){ + return vipService.getVipProductForUser(); + } } diff --git a/src/main/java/com/peanut/modules/sociology/service/VipService.java b/src/main/java/com/peanut/modules/sociology/service/VipService.java new file mode 100644 index 00000000..bd4bc8ba --- /dev/null +++ b/src/main/java/com/peanut/modules/sociology/service/VipService.java @@ -0,0 +1,9 @@ +package com.peanut.modules.sociology.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.common.utils.R; +import com.peanut.modules.common.entity.VipBuyConfigEntity; + +public interface VipService extends IService { + R getVipProductForUser(); +} diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/VipServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/VipServiceImpl.java new file mode 100644 index 00000000..98375a9b --- /dev/null +++ b/src/main/java/com/peanut/modules/sociology/service/impl/VipServiceImpl.java @@ -0,0 +1,44 @@ +package com.peanut.modules.sociology.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.common.utils.R; +import com.peanut.common.utils.ShiroUtils; +import com.peanut.modules.common.dao.MyUserDao; +import com.peanut.modules.common.dao.VipBuyConfigDao; +import com.peanut.modules.common.entity.MyUserEntity; +import com.peanut.modules.common.entity.VipBuyConfigEntity; +import com.peanut.modules.sociology.service.VipService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +@Slf4j +@Service("sociologyUserService") +public class VipServiceImpl extends ServiceImpl implements VipService { + @Autowired + private MyUserDao myUserDao; + + /** + * 获取国学vip商品 + * @return + */ + @Override + public R getVipProductForUser() { + int uid = ShiroUtils.getUId(); + MyUserEntity userEntity = myUserDao.selectById(uid); + //获取超v列表 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(VipBuyConfigEntity::getType, 1); + wrapper.and(r->r.eq(VipBuyConfigEntity::getDateType,0).or(f->f.eq(VipBuyConfigEntity::getDateType,1).lt(VipBuyConfigEntity::getStartTime,new Date()).gt(VipBuyConfigEntity::getEndTime,new Date()))); + List vipBuyConfigEntities = this.getBaseMapper().selectList(wrapper); + + + + + return R.ok().put("list",vipBuyConfigEntities); + } +}