From 78a7c810e5f2e30ee596401febc733148830467f Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 20 一月 2026 18:04:06 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsShopController.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsShopController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsShopController.java
index 183cbbf..5eb07e0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsShopController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsShopController.java
@@ -1,15 +1,13 @@
package com.ruoyi.web.controller.api;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.ShoppingCartItem;
-import com.ruoyi.system.model.TCrmSupplier;
-import com.ruoyi.system.model.TErpGoods;
-import com.ruoyi.system.model.TErpGoodsType;
-import com.ruoyi.system.model.TErpGoodsUnit;
+import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TErpGoodsShopQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.ShopCarVO;
@@ -18,14 +16,12 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -53,6 +49,7 @@
private final TCrmClinicService crmClinicService;
private final TCrmSupplierService crmSupplierService;
private final ISysUserService sysUserService;
+ private final TErpProcurementGoodsService erpProcurementGoodsService;
@Autowired
private RedisCache redisCache;
@@ -61,7 +58,7 @@
@Autowired
public TErpGoodsShopController(TErpGoodsService erpGoodsService, TokenService tokenService, TErpGoodsTypeService erpGoodsTypeService, TErpGoodsUnitService erpGoodsUnitService,
TErpSupplierWarehousingBatchService erpSupplierWarehousingBatchService, TErpSupplierWarehousingService erpSupplierWarehousingService,
- TErpSupplierOutboundGoodsService erpSupplierOutboundGoodsService, TErpMaintenanceReminderService erpMaintenanceReminderService, TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService, ISysUserService sysUserService) {
+ TErpSupplierOutboundGoodsService erpSupplierOutboundGoodsService, TErpMaintenanceReminderService erpMaintenanceReminderService, TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService, ISysUserService sysUserService, TErpProcurementGoodsService erpProcurementGoodsService) {
this.erpGoodsService = erpGoodsService;
this.tokenService = tokenService;
this.erpGoodsTypeService = erpGoodsTypeService;
@@ -73,6 +70,7 @@
this.crmClinicService = crmClinicService;
this.crmSupplierService = crmSupplierService;
this.sysUserService = sysUserService;
+ this.erpProcurementGoodsService = erpProcurementGoodsService;
}
/**
@@ -101,6 +99,17 @@
TErpGoodsUnit goodsUnit = erpGoodsUnitService.getById(goods.getPackingUnitId());
if (goodsUnit != null) res.setPackingUnitName(goodsUnit.getUnitName());
}
+
+ List<TErpProcurementGoods> tErpProcurementGoods = erpProcurementGoodsService.list(new LambdaQueryWrapper<TErpProcurementGoods>()
+ .in(TErpProcurementGoods::getGoodsId, goods.getId()));
+ if(!CollectionUtils.isEmpty(tErpProcurementGoods)){
+ // 计算采购数量
+ int sum = tErpProcurementGoods.stream().filter(e -> e.getPurchaseCount() != null).mapToInt(TErpProcurementGoods::getPurchaseCount).sum();
+ res.setSalesCount(sum);
+ }else {
+ res.setSalesCount(0);
+ }
+
return R.ok(res);
}
@ApiOperation(value = "海诊商城-清空购物车")
@@ -112,7 +121,7 @@
}
@ApiOperation(value = "海诊商城-购买后删除购物车商品")
@GetMapping(value = "/clearByIds")
- public void clearByIds(String ids) {
+ public R<String> clearByIds(String ids) {
List<String> list = Arrays.asList(ids.split(","));
Long userId = tokenService.getLoginUser().getUserId();
List<ShoppingCartItem> cacheList = redisCache.getCacheList("shopCart:"+userId);
@@ -126,6 +135,7 @@
if (!res.isEmpty()){
redisCache.setCacheList("shopCart:"+userId, res);
}
+ return R.ok();
}
@ApiOperation(value = "海诊商城-单删购物车")
@GetMapping(value = "/clearById")
--
Gitblit v1.7.1