Merge remote-tracking branch 'origin/master'

无关风月

2026-01-12 2d89841fa069110fe492b6d006e00774e4700fd7

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

@@ -6,6 +6,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.controller.FileController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
@@ -58,8 +59,9 @@
    private final FileController fileController;
    private final WeixinProperties wxConfig;
    private final TCrmClinicService crmClinicService;
    private final ISysUserService sysUserService;
    @Autowired
    public TSysAppUserController(TSysAppUserService sysAppUserService, TSysInspectionService sysInspectionService, TSysOrderService sysOrderService, TSysChronicDiseaseService sysChronicDiseaseService, TokenService tokenService, RedisCache redisCache, XimaAIUtil ximaAIUtil, RestTemplate restTemplate, FileController fileController, WeixinProperties wxConfig, TCrmClinicService crmClinicService) {
    public TSysAppUserController(TSysAppUserService sysAppUserService, TSysInspectionService sysInspectionService, TSysOrderService sysOrderService, TSysChronicDiseaseService sysChronicDiseaseService, TokenService tokenService, RedisCache redisCache, XimaAIUtil ximaAIUtil, RestTemplate restTemplate, FileController fileController, WeixinProperties wxConfig, TCrmClinicService crmClinicService, ISysUserService sysUserService) {
        this.sysAppUserService = sysAppUserService;
        this.sysInspectionService = sysInspectionService;
        this.sysOrderService = sysOrderService;
@@ -71,6 +73,7 @@
        this.fileController = fileController;
        this.wxConfig = wxConfig;
        this.crmClinicService = crmClinicService;
        this.sysUserService = sysUserService;
    }

    /**
@@ -113,6 +116,13 @@
        // 订单信息
        List<TSysOrderVO> sysOrders = sysOrderService.queryListByAppUserId(id);
        sysAppUserVO.setSysOrders(sysOrders);
        // 查询诊所账号
        SysUser sysUser = sysUserService.selectByPhone(sysAppUserVO.getPhone());
        if(Objects.nonNull(sysUser)){
            sysAppUserVO.setIsClinicUser(1);
        }else {
            sysAppUserVO.setIsClinicUser(0);
        }
        return R.ok(sysAppUserVO);
    }

@@ -176,10 +186,13 @@

        String userId = tokenService.getLoginUserApplet().getUserId();
        TSysAppUser sysAppUser = sysAppUserService.getById(userId);
        if(StringUtils.isBlank(sysAppUser.getClinicId())){
            return R.fail("请先绑定诊所");
        SysUser sysUser = sysUserService.selectByPhone(sysAppUser.getPhone());
        if(Objects.isNull(sysUser)){
            return R.fail("该用户非诊所用户");
        }
        TCrmClinic crmClinic = crmClinicService.getById(sysAppUser.getClinicId());
        TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                .eq(TCrmClinic::getUserId, sysUser.getUserId())
                .last("LIMIT 1"));
        if(Objects.isNull(crmClinic)){
            return R.fail("未找到该诊所信息");
        }