代码提交

无关风月

2024-11-12 3ec572e2cb7adf7d33d2018b24c003d9ef18906a

 xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationQuestionController.java

@@ -17,14 +17,12 @@
import com.xinquan.meditation.domain.export.QuestionExport;
import com.xinquan.meditation.service.MeditationCategoryService;
import com.xinquan.meditation.service.MeditationQuestionService;
import com.xinquan.meditation.service.MeditationQuestionService;
import com.xinquan.meditation.service.MeditationService;
import com.xinquan.system.api.RemoteUserService;
import com.xinquan.system.api.domain.AppUser;
import com.xinquan.system.api.domain.MeditationQuestion;
import com.xinquan.meditation.api.domain.MeditationQuestion;
import com.xinquan.meditation.api.domain.vo.NoticeDetailVO;
import com.xinquan.system.api.domain.NoticeRecord;
import com.xinquan.system.api.model.LoginUser;
import com.xinquan.user.api.domain.dto.OrderListDTO;
import com.xinquan.user.api.feign.RemoteAppUserService;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.usermodel.Workbook;
@@ -39,9 +37,7 @@
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -66,6 +62,12 @@

    @Autowired
    private TokenService tokenService;
    @GetMapping("/getMeditationQuestion/{id}")
    public R<MeditationQuestion> getMeditationQuestion(@PathVariable("id") String id){
        MeditationQuestion byId = meditationQuestionService.getById(id);
        return R.ok(byId);
    }

    /**
     * 远程调用 查询待回复内容数量
     * @return
@@ -122,9 +124,9 @@
            }
            meditationLambdaQueryWrapper.in(MeditationQuestion::getAppUserId,data);
        }
        if (StringUtils.hasLength(dto.getName())){
        if (StringUtils.hasLength(dto.getMeditationName())){
            List<Long> collect = meditationService.lambdaQuery()
                    .like(Meditation::getMeditationTitle, dto.getName())
                    .like(Meditation::getMeditationTitle, dto.getMeditationName())
                    .list().stream().map(Meditation::getId).collect(Collectors.toList());
            if (collect.isEmpty()){
                collect.add(-1L);
@@ -196,9 +198,9 @@
        meditationLambdaQueryWrapper.eq(dto.getShowFlag()!=null,MeditationQuestion::getShowFlag, dto.getShowFlag());
        if (dto.getIsReplay()!=null){
            if (dto.getIsReplay() == 1){
                meditationLambdaQueryWrapper.isNotNull(MeditationQuestion::getReplyTime);
                meditationLambdaQueryWrapper.isNotNull(MeditationQuestion::getReplyContent);
            }else{
                meditationLambdaQueryWrapper.isNull(MeditationQuestion::getReplyTime);
                meditationLambdaQueryWrapper.isNull(MeditationQuestion::getReplyContent);
            }
        }
        if (StringUtils.hasLength(dto.getUserName())){
@@ -208,15 +210,17 @@
            }
            meditationLambdaQueryWrapper.in(MeditationQuestion::getAppUserId,data);
        }
        if (StringUtils.hasLength(dto.getName())){
        if (StringUtils.hasLength(dto.getMeditationName())){
            List<Long> collect = meditationService.lambdaQuery()
                    .like(Meditation::getMeditationTitle, dto.getName())
                    .like(Meditation::getMeditationTitle, dto.getMeditationName())
                    .list().stream().map(Meditation::getId).collect(Collectors.toList());
            if (collect.isEmpty()){
                collect.add(-1L);
            }
            meditationLambdaQueryWrapper.in(MeditationQuestion::getMeditationId,collect);
        }
        meditationLambdaQueryWrapper.orderBy(true, true, MeditationQuestion::getReplyContent);  // "reply_content IS NULL" 确保 null 排前面

        meditationLambdaQueryWrapper.orderByDesc(MeditationQuestion::getCreateTime);
        Page<MeditationQuestion> page = meditationQuestionService.page(new Page<>(dto.getPageCurr(), dto.getPageSize()), meditationLambdaQueryWrapper);
        if (CollUtils.isEmpty(page.getRecords())) {
@@ -231,15 +235,21 @@
                record.setCellPhone(data.getCellPhone());
            }
            Meditation byId = meditationService.getById(record.getMeditationId());

            if (byId!=null){
                record.setChargeType(byId.getChargeType());
                MeditationCategory byId1 = meditationCategoryService.getById(byId.getCateId());
                if (byId1!=null){
                    record.setMeditationCategoryName(byId1.getCategoryName());
                }
                record.setMeditationName(byId.getMeditationTitle());
                if (byId.getChargeType()!=null &&byId.getChargeType() == 3){
                    record.setMoney(byId.getGeneralPrice());
                }
            }

        }
//        List<MeditationQuestion> records = page.getRecords();
//        page.setRecords(records);
        return R.ok(PageDTO.of(page, MeditationQuestion.class));
    }
    @PostMapping("/addMeditationQuestion")
@@ -275,19 +285,35 @@
        if (byId1!=null){
            byId.setMeditationName(byId1.getMeditationTitle());
            byId.setChargeType(byId1.getChargeType());
            byId.setCoverUrl(byId1.getCoverUrl().split(",")[0]);
        }
        MeditationCategory byId2 = meditationCategoryService.getById(byId1.getCateId());
        if (byId2!=null){
            byId.setMeditationCategoryName(byId2.getCategoryName());

        }
        return R.ok();
        return R.ok(byId);
    }
    @PostMapping("/updateMeditationQuestion")
    @ApiOperation(value = "修改提问管理", tags = "管理后台-提问管理")
    public R updateMeditationQuestion(@RequestBody MeditationQuestion homeBackgroundMusic) {
        Long id = homeBackgroundMusic.getId();
        MeditationQuestion byId = meditationQuestionService.getById(id);
        homeBackgroundMusic.setUpdateBy(SecurityUtils.getUsername());
        homeBackgroundMusic.setUpdateTime(LocalDateTime.now());
        if (homeBackgroundMusic.getType() == 2){
            homeBackgroundMusic.setReplyTime(LocalDateTime.now());
            // 给用户添加一条系统消息
            NoticeRecord noticeRecord = new NoticeRecord();
            noticeRecord.setAppUserId(byId.getAppUserId());
            noticeRecord.setMeditationQuestionId(homeBackgroundMusic.getId());
            noticeRecord.setReadStatus(1);
            noticeRecord.setNoticeType(2);
            noticeRecord.setMeditationId(byId.getMeditationId());
            noticeRecord.setTitle("平台回复通知");
            noticeRecord.setContent(homeBackgroundMusic.getReplyContent());
            remoteAppUserService.addNoticeReplay(noticeRecord);
        }
        return R.ok(meditationQuestionService.updateById(homeBackgroundMusic));
    }
    @PostMapping("/deleteMeditationQuestion")