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-system/src/main/resources/mapper/system/TErpGoodsMapper.xml | 6 ++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysLiveController.java | 1 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsShopController.java | 30 ++++++++++++++++++++----------
ruoyi-system/src/main/java/com/ruoyi/system/model/TSysLive.java | 1 -
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysBannerController.java | 10 +++++++---
5 files changed, 34 insertions(+), 14 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")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysBannerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysBannerController.java
index c4075ea..c803caa 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysBannerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysBannerController.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.model.TSysBanner;
import com.ruoyi.system.query.TSysBannerQuery;
import com.ruoyi.system.service.TSysBannerService;
@@ -31,9 +32,11 @@
@RequestMapping("/t-sys-banner")
public class TSysBannerController {
private final TSysBannerService sysBannerService;
+ private final TokenService tokenService;
@Autowired
- public TSysBannerController(TSysBannerService sysBannerService) {
+ public TSysBannerController(TSysBannerService sysBannerService, TokenService tokenService) {
this.sysBannerService = sysBannerService;
+ this.tokenService = tokenService;
}
/**
@@ -42,7 +45,6 @@
@ApiOperation(value = "获取banner管理分页列表")
@PostMapping(value = "/pageList")
public R<PageInfo<TSysBannerVO>> pageList(@RequestBody TSysBannerQuery query) {
- query.setPort(1);
return R.ok(sysBannerService.pageList(query));
}
@@ -52,7 +54,9 @@
@ApiOperation(value = "获取banner管理列表")
@PostMapping(value = "/list")
public R<List<TSysBanner>> list() {
- return R.ok(sysBannerService.list(Wrappers.lambdaQuery(TSysBanner.class).orderByDesc(TSysBanner::getCreateTime)));
+ return R.ok(sysBannerService.list(Wrappers.lambdaQuery(TSysBanner.class)
+ .eq(TSysBanner::getPort,1)
+ .orderByDesc(TSysBanner::getCreateTime)));
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysLiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysLiveController.java
index 983c114..a08a3aa 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysLiveController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysLiveController.java
@@ -85,6 +85,7 @@
@PostMapping(value = "/listBanner")
public R<List<TSysLive>> listBanner() {
return R.ok(sysLiveService.list(Wrappers.lambdaQuery(TSysLive.class)
+ .gt(TSysLive::getEndTime, LocalDateTime.now())
.orderByDesc(TSysLive::getCreateTime)));
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysLive.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysLive.java
index a2ac49a..4c64d20 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysLive.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysLive.java
@@ -54,7 +54,6 @@
@TableField("end_time")
private LocalDateTime endTime;
- @NotNull(message = "预计时长不能为空")
@ApiModelProperty(value = "预计时长")
@TableField("expected_duration")
private Integer expectedDuration;
diff --git a/ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml
index a2f7e6d..4497677 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml
@@ -475,6 +475,12 @@
#{id}
</foreach>
</if>
+ <if test="query.typeIds != null and query.typeIds.size()>0">
+ AND t1.type_id IN
+ <foreach collection="query.typeIds" close=")" open="(" item="id" separator=",">
+ #{id}
+ </foreach>
+ </if>
</select>
<select id="pageShopListAll" resultType="com.ruoyi.system.vo.TErpGoodsVO">
--
Gitblit v1.7.1