Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-08-20 e610cacda2b7431cf2161e0e39d37db3b2950bee

Merge remote-tracking branch 'origin/master'

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java

@@ -134,11 +134,12 @@

    @Autowired
    private TAppUserMapper tAppUserMapper;
    @Autowired
    private TokenService tokenService;
    @Override
    public PageInfo<CouponListVOVO> couponList(CouponListDto dto) {
        // todo token获取用户id
        Long userId = 11L;
        dto.setUserId(userId);
        dto.setUserId(tokenService.getLoginUserApplet().getUserId());
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        PageInfo<CouponListVOVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
        List<CouponListVOVO> list = this.baseMapper.couponList(pageInfo,dto.getUserId());