From d72d88f9e19ead4bbc2f69c4f5fbe66b1edbdc31 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 10 十月 2025 18:16:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 insertions(+), 1 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 09f50f7..0e96b68 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
@@ -16,12 +16,14 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ip.IpUtils;
import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.dto.TSysOrderDto;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TErpGoodsWarehouseQuery;
import com.ruoyi.system.query.TSysAppUserQuery;
import com.ruoyi.system.query.TSysEducationalInfoQuery;
import com.ruoyi.system.query.TSysOrderQuery;
import com.ruoyi.system.service.*;
+import com.ruoyi.system.vo.TSysOrderDetailVo;
import com.ruoyi.system.vo.TSysOrderPageVo;
import com.ruoyi.web.core.config.LakalaConfig;
import io.swagger.annotations.Api;
@@ -80,15 +82,17 @@
private final TokenService tokenService;
private final TCrmClinicService crmClinicService;
private final TSysAppUserService sysAppUserService;
+ private final TSysOrderGoodsService sysOrderGoodsService;
@Autowired
- public TSysOrderController(TokenService tokenService, TSysOrderService sysOrderService, TCrmClinicService crmClinicService, TSysAppUserService sysAppUserService) {
+ public TSysOrderController(TokenService tokenService, TSysOrderService sysOrderService, TCrmClinicService crmClinicService, TSysAppUserService sysAppUserService, TSysOrderGoodsService sysOrderGoodsService) {
this.sysOrderService = sysOrderService;
this.tokenService = tokenService;
this.crmClinicService = crmClinicService;
this.sysAppUserService = sysAppUserService;
+ this.sysOrderGoodsService = sysOrderGoodsService;
}
@@ -127,5 +131,44 @@
return R.ok(list);
}
+
+ @ApiOperation(value = "诊所患者诊疗--确认添加")
+ @PostMapping(value = "/add")
+ public R<String> add(@RequestBody @Valid TSysOrderDto dto) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ Integer roleType = user.getRoleType();
+
+ if(roleType == 5){
+ // 诊所
+ TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
+ .eq(TCrmClinic::getUserId, user.getUserId())
+ .last("LIMIT 1"));
+ sysOrderService.add(dto,crmClinic);
+ return R.ok("添加成功");
+ }
+ return R.fail("添加失败");
+ }
+
+
+ @ApiOperation(value = "诊所患者诊疗--详情")
+ @GetMapping(value = "/detail/{id}")
+ public R<TSysOrderDetailVo> detail(@PathVariable String id) {
+ TSysOrder tSysOrder = sysOrderService.getById(id);
+
+ TSysOrderDetailVo detail = new TSysOrderDetailVo();
+ detail.setId(tSysOrder.getId());
+ String appUserId = tSysOrder.getAppUserId();
+ TSysAppUser appUser = sysAppUserService.getById(appUserId);
+ detail.setUserName(appUser.getNickName());
+ detail.setCheckTime(tSysOrder.getCheckTime());
+ detail.setTotalMoney(tSysOrder.getTotalMoney());
+
+ List<TSysOrderGoods> list = sysOrderGoodsService.list(new LambdaQueryWrapper<TSysOrderGoods>().eq(TSysOrderGoods::getOrderId, id));
+ detail.setList(list);
+
+ return R.ok(detail);
+ }
+
+
}
--
Gitblit v1.7.1