Merge remote-tracking branch 'origin/master'

无关风月

2026-01-12 e92c772a05d27f76cb46635556fcda38c754606a

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

@@ -20,8 +20,10 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

/**
 * <p>
@@ -168,6 +170,10 @@
        if(sysAppUser != null){
            sysInspection.setAppUserId(sysAppUser.getId());
            sysInspection.setClinicId(sysAppUser.getClinicId());
            LocalDateTime vipEndTime = sysAppUser.getVipEndTime();
            if(Objects.nonNull(vipEndTime) && vipEndTime.isAfter(LocalDateTime.now())){
                sysInspection.setIsPay(1);
            }
        }
        sysInspection.setOutUserId(outUserId);
        sysInspection.setBirthday(birthday);
@@ -176,12 +182,12 @@
        // 小程序检测
        sysInspection.setInspectionType(2);

        // TODO 舌诊信息
        // 舌诊信息
        JSONObject phyTongueInfo = jsonObject.getJSONObject("phyTongueInfo");
        JSONObject tongueNatureColorInfo = phyTongueInfo.getJSONObject("tongueNatureColorInfo"); // 舌色信息
        String tongueNatureColor = tongueNatureColorInfo.getString("tongueNatureColorClinical"); // 舌色临床意义
        sysInspection.setTongueNatureColor(tongueNatureColor);
        // TODO 面诊信息
        // 面诊信息
        JSONObject phyFaceInfo = jsonObject.getJSONObject("phyFaceInfo");
        JSONObject lipColorInfo = phyFaceInfo.getJSONObject("lipColorInfo"); // 唇色信息
        String lipColorClinical = lipColorInfo.getString("lipColorClinical"); // 唇色临床意义
@@ -246,6 +252,7 @@
        sysInspection.setDeviceAccountId(device_account_id);
        // 硬件检测
        sysInspection.setInspectionType(3);
        sysInspection.setIsPay(1);

        // 通过手机号查询小程序用户
        TSysAppUser sysAppUser = sysAppUserService.getOne(Wrappers.lambdaQuery(TSysAppUser.class)