From 7e4ed5384c48c3ffc32df08c5c3bbd3897027589 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 09 二月 2026 11:05:11 +0800
Subject: [PATCH] 云仓对接修改bug
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmClinicServiceImpl.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmClinicServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmClinicServiceImpl.java
index d89d1a6..899e203 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmClinicServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmClinicServiceImpl.java
@@ -72,6 +72,10 @@
List<TCrmClinicPoints> points = crmClinicPointsMapper.selectList(new LambdaQueryWrapper<TCrmClinicPoints>().in(TCrmClinicPoints::getClinicId, clinicIds).ge(TCrmClinicPoints::getExpireTime, new Date()).last(" and points > use_points ORDER BY create_time ASC"));
+ // 查询诊所仓库
+ List<TCrmClinicCloudWarehouse> crmClinicCloudWarehouses = crmClinicCloudWarehouseService.list(new LambdaQueryWrapper<TCrmClinicCloudWarehouse>()
+ .in(TCrmClinicCloudWarehouse::getClinicId, clinicIds));
+
for (TCrmClinicVO tCrmClinicVO : list) {
List<TErpProcurement> procurementList = procurements.stream().filter(procurement -> procurement.getClinicId().equals(tCrmClinicVO.getId())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(procurementList)){
@@ -87,6 +91,8 @@
int userPoints = pointsList.stream().mapToInt(item -> item.getPoints() - item.getUsePoints()).sum();
tCrmClinicVO.setUserPoints(userPoints);
+ List<TCrmClinicCloudWarehouse> clinicCloudWarehouses = crmClinicCloudWarehouses.stream().filter(item -> tCrmClinicVO.getId().equals(item.getClinicId())).collect(Collectors.toList());
+ tCrmClinicVO.setCrmClinicCloudWarehouses(clinicCloudWarehouses);
}
pageInfo.setRecords(list);
return pageInfo;
@@ -96,6 +102,17 @@
public PageInfo<TCrmClinicVO> pageAuditList(TCrmClinicQuery query) {
PageInfo<TCrmClinicVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TCrmClinicVO> list = this.baseMapper.pageAuditList(query,pageInfo);
+ if(CollectionUtils.isEmpty(list)){
+ return pageInfo;
+ }
+ List<String> clinicIds = list.stream().map(TCrmClinicVO::getId).collect(Collectors.toList());
+ // 查询诊所仓库
+ List<TCrmClinicCloudWarehouse> crmClinicCloudWarehouses = crmClinicCloudWarehouseService.list(new LambdaQueryWrapper<TCrmClinicCloudWarehouse>()
+ .in(TCrmClinicCloudWarehouse::getClinicId, clinicIds));
+ for (TCrmClinicVO tCrmClinicVO : list) {
+ List<TCrmClinicCloudWarehouse> clinicCloudWarehouses = crmClinicCloudWarehouses.stream().filter(item -> tCrmClinicVO.getId().equals(item.getClinicId())).collect(Collectors.toList());
+ tCrmClinicVO.setCrmClinicCloudWarehouses(clinicCloudWarehouses);
+ }
pageInfo.setRecords(list);
return pageInfo;
}
--
Gitblit v1.7.1