回调修改

xuhy

2026-01-21 837aafb05562a3cdc5b6b0e6ec40e409eab86673

回调修改

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysLiveController.java

@@ -28,6 +28,7 @@
import java.time.LocalDateTime;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;

/**
@@ -97,11 +98,13 @@
    @PostMapping(value = "/add")
    public R<Boolean> add(@Validated @RequestBody TSysLive dto) {
        // 直播开始时间无法小于当前时间
        if (dto.getStartTime().isBefore(LocalDateTime.now())) {
        if (Objects.nonNull(dto.getStartTime()) && dto.getStartTime().isBefore(LocalDateTime.now())) {
            return R.fail("直播开始时间无法小于当前时间");
        }
        // 计算结束时间
        dto.setEndTime(dto.getStartTime().plusMinutes(dto.getExpectedDuration()));
        if(Objects.nonNull(dto.getStartTime()) && Objects.nonNull(dto.getExpectedDuration())){
            dto.setEndTime(dto.getStartTime().plusMinutes(dto.getExpectedDuration()));
        }

        // 创建小鹅通直播
//        XiaoeLiveDTO xiaoeLiveDTO = new XiaoeLiveDTO();

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/H5AICallbackController.java

@@ -235,7 +235,7 @@
    public JSONObject xiMaDoubleScreenReportPush(@RequestBody JSONObject jsonObject){
        log.info("双屏仪报告推送:{}",jsonObject);
        TSysAiMessage tSysAiMessage = new TSysAiMessage();
        tSysAiMessage.setCommitType(1);
        tSysAiMessage.setCommitType(2);
        tSysAiMessage.setContent(jsonObject.toJSONString());
        tSysAiMessage.setCreateTime(LocalDateTime.now());
        // 主体信息
@@ -311,7 +311,6 @@
            tSysAiMessage.setErrorMessage("未查询到诊所绑定账号");
            sysAiMessageService.save(tSysAiMessage);
        }

        sysInspectionService.save(sysInspection);

        // 指脉结果
@@ -368,6 +367,8 @@
            }
        }
        sysAppUserService.saveOrUpdate(sysAppUser);
        sysInspection.setAppUserId(sysAppUser.getId());
        sysInspection.setClinicId(sysAppUser.getClinicId());
        sysInspectionRiskEstimateService.saveBatch(sysInspectionRiskEstimates);

        JSONObject response = new JSONObject();

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysAppUserController.java

@@ -129,7 +129,7 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, sysUser.getUserId())
                    .last("LIMIT 1"));
            if(StringUtils.isBlank(sysAppUserVO.getClinicId())){
            if(Objects.nonNull(crmClinic) && StringUtils.isBlank(sysAppUserVO.getClinicId())){
                sysAppUserVO.setClinicId(crmClinic.getId());
            }
        }else {

 ruoyi-system/src/main/resources/mapper/system/TSysPayRecordMapper.xml

@@ -29,7 +29,7 @@
                AND tsau.nick_name LIKE CONCAT('%', #{query.nickName}, '%')
            </if>
            <if test="query.orderType != null ">
                and tspr.orderType = #{query.orderType}
                and tspr.order_type = #{query.orderType}
            </if>
            <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
                AND tspr.pay_time &gt;= #{query.startTime}
@@ -50,7 +50,7 @@
                AND tsau.nick_name LIKE CONCAT('%', #{query.nickName}, '%')
            </if>
            <if test="query.orderType != null ">
                and tspr.orderType = #{query.orderType}
                and tspr.order_type = #{query.orderType}
            </if>
            <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
                AND tspr.pay_time &gt;= #{query.startTime}