From 3eda5364adada942f76a9f8a5f57881406f44286 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 29 十月 2025 10:10:38 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java
index 96660c1..9d8fedd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java
@@ -14,10 +14,7 @@
import com.ruoyi.system.model.TSysOrderGoods;
import com.ruoyi.system.query.TSysAppUserQuery;
import com.ruoyi.system.query.TSysOrderQuery;
-import com.ruoyi.system.service.TCrmClinicService;
-import com.ruoyi.system.service.TSysAppUserService;
-import com.ruoyi.system.service.TSysOrderGoodsService;
-import com.ruoyi.system.service.TSysOrderService;
+import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TSysOrderDetailVo;
import com.ruoyi.system.vo.TSysOrderPageVo;
import io.swagger.annotations.Api;
@@ -27,6 +24,7 @@
import javax.validation.Valid;
import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -46,17 +44,19 @@
private final TCrmClinicService crmClinicService;
private final TSysAppUserService sysAppUserService;
private final TSysOrderGoodsService sysOrderGoodsService;
+ private final ISysUserService sysUserService;
@Autowired
- public TSysOrderController(TokenService tokenService, TSysOrderService sysOrderService, TCrmClinicService crmClinicService, TSysAppUserService sysAppUserService, TSysOrderGoodsService sysOrderGoodsService) {
+ public TSysOrderController(TokenService tokenService, TSysOrderService sysOrderService, TCrmClinicService crmClinicService, TSysAppUserService sysAppUserService, TSysOrderGoodsService sysOrderGoodsService, ISysUserService sysUserService) {
this.sysOrderService = sysOrderService;
this.tokenService = tokenService;
this.crmClinicService = crmClinicService;
this.sysAppUserService = sysAppUserService;
this.sysOrderGoodsService = sysOrderGoodsService;
+ this.sysUserService = sysUserService;
}
/**
@@ -73,6 +73,11 @@
TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
.eq(TCrmClinic::getUserId, user.getUserId())
.last("LIMIT 1"));
+ // ---
+ if(Objects.isNull(crmClinic)){
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
query.setClinicId(crmClinic.getId());
}
return R.ok(sysOrderService.pageList(query));
@@ -106,6 +111,11 @@
TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
.eq(TCrmClinic::getUserId, user.getUserId())
.last("LIMIT 1"));
+ // ---
+ if(Objects.isNull(crmClinic)){
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
sysOrderService.add(dto,crmClinic,user.getNickName(),user.getUserId().toString());
return R.ok("添加成功");
}
--
Gitblit v1.7.1