修复app端加入玩湃中课程列表数据字段bug；使用福利的课时详情的记录bug

lisy

2023-08-03 0d998afc5dd5a41851e34d8b8b742e4934e6fd62

 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java

@@ -498,6 +498,8 @@
        TAppUser appUser = this.getById(appUserId);
        benefirVo.setUserHeadImg(appUser.getHeadImg());
        benefirVo.setUserName(appUser.getName());
        benefirVo.setWpCoin(ToolUtil.isEmpty(appUser.getPlayPaiCoins()) ? 0 : appUser.getPlayPaiCoins());
        benefirVo.setUserIntegral(ToolUtil.isEmpty(appUser.getIntegral()) ? 0 : appUser.getIntegral());
        if (appUser.getIsVip() == 1){
            benefirVo.setIsMember("年度会员");
        }else {
@@ -757,26 +759,34 @@
            }
        }
        if (StringUtils.hasText(request.getSearch())){
            if (goods.size() > 0 ){
            goods = goods.stream()
                    .filter(merchandise -> merchandise.getGoodName().contains(request.getSearch()))
                    .collect(Collectors.toList());
        }
        }
        if (null != request.getRank()){
            switch (request.getRank()){
                case 1:
                    if (goods.size() > 0 ){
                    goods = goods.stream()
                            .sorted(Comparator.comparing(Goods::getIntegral).reversed())
                            .collect(Collectors.toList());
                    }
                    break;
                case 2:
                    if (goods.size() > 0 ){
                    goods = goods.stream()
                            .sorted(Comparator.comparing(Goods::getIntegral))
                            .collect(Collectors.toList());
                    }
                    break;
                case 3:
                    if (goods.size() > 0 ){
                    goods = goods.stream()
                            .sorted(Comparator.comparing(Goods::getNums).reversed())
                            .collect(Collectors.toList());
                    }
                    break;
                default:
                    break;
@@ -784,10 +794,12 @@

        }
        if (null != request.getGoodsType()){
            if (goods.size() > 0 ){
            goods = goods.stream()
                    .filter(merchandise -> merchandise.getGoodsType().equals(request.getGoodsType()))
                    .collect(Collectors.toList());
        }
        }
        Pageable pageable = PageRequest.of(request.getPageNum() - 1, request.getPageSize());
        Page<Goods> page = getPage(goods, pageable);
        return page.getContent();