From b6aca44ae23914919608499bdb114d80e0f1b196 Mon Sep 17 00:00:00 2001
From: yyb <1416014977@qq.com>
Date: Wed, 28 Jan 2026 09:53:49 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=95=86=E5=9F=8E=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E7=9F=BF=E6=9C=BA=E5=88=97=E8=A1=A8=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=9C=AC=E7=94=A8=E6=88=B7=E6=98=AF=E5=90=A6=E5=9C=A8=E8=B4=AD?=
 =?UTF-8?q?=E7=89=A9=E8=BD=A6=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../m2pool/lease/dto/v2/MachineInfoDto.java   |  3 +++
 .../service/impl/LeaseMachineServiceImpl.java | 23 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/src/main/java/com/m2pool/lease/dto/v2/MachineInfoDto.java b/src/main/java/com/m2pool/lease/dto/v2/MachineInfoDto.java
index 0b9ff72..4fb435f 100644
--- a/src/main/java/com/m2pool/lease/dto/v2/MachineInfoDto.java
+++ b/src/main/java/com/m2pool/lease/dto/v2/MachineInfoDto.java
@@ -98,4 +98,7 @@ public class MachineInfoDto {
 
     @ApiModelProperty(value = "店铺售价集合")
     private List<MachinePayTypeDto> priceList;
+
+    @ApiModelProperty(value = "是否在购物车中")
+    private Boolean inCart;
 }
diff --git a/src/main/java/com/m2pool/lease/service/impl/LeaseMachineServiceImpl.java b/src/main/java/com/m2pool/lease/service/impl/LeaseMachineServiceImpl.java
index 25162d5..d10fd5f 100644
--- a/src/main/java/com/m2pool/lease/service/impl/LeaseMachineServiceImpl.java
+++ b/src/main/java/com/m2pool/lease/service/impl/LeaseMachineServiceImpl.java
@@ -61,6 +61,9 @@ public class LeaseMachineServiceImpl extends ServiceImpl<LeaseMachineMapper, Lea
     @Resource
     private LeaseOrderItemMapper leaseOrderItemMapper;
 
+    @Resource
+    private LeaseShoppingCartInfoMapper leaseShoppingCartInfoMapper;
+
     public LeaseShop getShopById() {
         return leaseShopMapper.selectOne(new LambdaQueryWrapper<LeaseShop>().eq(LeaseShop::getUserEmail, SecurityUtils.getUsername())
                 .eq(LeaseShop::getDel, false));
@@ -101,6 +104,26 @@ public class LeaseMachineServiceImpl extends ServiceImpl<LeaseMachineMapper, Lea
         PageInfo<MachineInfoDto> pageInfo = new PageInfo<>(machineInfoDtoList);
         //获取gpu和asic对应币种算力和月收益信息
         PageResult<MachineInfoDto> success = setGpuAndAsicInfo(PageResult.successColumns(machineInfoDtoList),shopMachineVo);
+
+        //查询用户购物车中的矿机
+        String userId = SecurityUtils.getUsername();
+        if (StringUtils.isNotEmpty(userId)) {
+            List<LeaseShoppingCartInfo> cartItems = leaseShoppingCartInfoMapper.selectList(
+                new LambdaQueryWrapper<LeaseShoppingCartInfo>()
+                    .eq(LeaseShoppingCartInfo::getUserId, userId)
+                    .eq(LeaseShoppingCartInfo::getVersion, 1)  // 新版本购物车
+            );
+            // 收集购物车中的矿机ID
+            Set<Long> cartMachineIds = cartItems.stream()
+                .map(LeaseShoppingCartInfo::getProductMachineId)
+                .collect(Collectors.toSet());
+
+            // 设置购物车标识
+            for (MachineInfoDto machine : success.getRows()) {
+                machine.setInCart(cartMachineIds.contains(machine.getId()));
+            }
+        }
+
         success.setTotal(pageInfo.getTotal());
         success.setTotalPage(pageInfo.getPages());
         PageHelper.clearPage();