From 48fb364d955f9616c7f724ebb698b3ebf1ec470d Mon Sep 17 00:00:00 2001
From: yyb <1416014977@qq.com>
Date: Wed, 7 Jan 2026 17:34:24 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=A6=96=E9=A1=B5=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lease/mapper/LeaseMachineMapper.java      |  2 +-
 .../service/impl/LeaseMachineServiceImpl.java |  2 +-
 .../com/m2pool/lease/vo/ProductPageVo.java    |  3 ++
 .../mapper/lease/LeaseMachineMapper.xml       | 31 ++++++++++---------
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/m2pool/lease/mapper/LeaseMachineMapper.java b/src/main/java/com/m2pool/lease/mapper/LeaseMachineMapper.java
index d37aa18..1e54156 100644
--- a/src/main/java/com/m2pool/lease/mapper/LeaseMachineMapper.java
+++ b/src/main/java/com/m2pool/lease/mapper/LeaseMachineMapper.java
@@ -34,7 +34,7 @@ public interface LeaseMachineMapper extends BaseMapper<LeaseMachine> {
      * 根据id集合查询店铺信息
      * @return
      */
-    List<ShopInfoDto> getExistsMachineShop(@Param("ids") Set<Long> ids, @Param("coin") String coin , @Param("algorithm") String algorithm);
+    List<ShopInfoDto> getExistsMachineShop(@Param("ids") Set<Long> ids, @Param("keyword") String keyword );
 
 
     /**
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 a46aa84..6b7c119 100644
--- a/src/main/java/com/m2pool/lease/service/impl/LeaseMachineServiceImpl.java
+++ b/src/main/java/com/m2pool/lease/service/impl/LeaseMachineServiceImpl.java
@@ -74,7 +74,7 @@ public class LeaseMachineServiceImpl extends ServiceImpl<LeaseMachineMapper, Lea
             return PageResult.success(new ArrayList<>());
         }
         PageHelper.startPage(productPageVo.getPageNum(), productPageVo.getPageSize());
-        List<ShopInfoDto> existsMachineShop = leaseMachineMapper.getExistsMachineShop(shopIds, productPageVo.getCoin(), productPageVo.getAlgorithm());
+        List<ShopInfoDto> existsMachineShop = leaseMachineMapper.getExistsMachineShop(shopIds, productPageVo.getKeyword());
         PageInfo<ShopInfoDto> pageInfo = new PageInfo<>(existsMachineShop);
         //店铺支付方式
         List<PayTypeDto> payType = leaseShopConfigMapper.getPayType(new ArrayList<>(shopIds));
diff --git a/src/main/java/com/m2pool/lease/vo/ProductPageVo.java b/src/main/java/com/m2pool/lease/vo/ProductPageVo.java
index b33ec81..9132857 100644
--- a/src/main/java/com/m2pool/lease/vo/ProductPageVo.java
+++ b/src/main/java/com/m2pool/lease/vo/ProductPageVo.java
@@ -33,6 +33,9 @@ public class ProductPageVo extends PageVo{
     @ApiModelProperty(value = "算法")
     private String algorithm;
 
+    @ApiModelProperty(value = "关键字")
+    private String keyword;
+
     @ApiModelProperty(value = "用户邮箱(个人中心商品列表)")
     private String userEmail;
 }
diff --git a/src/main/resources/mapper/lease/LeaseMachineMapper.xml b/src/main/resources/mapper/lease/LeaseMachineMapper.xml
index f060238..0b299fb 100644
--- a/src/main/resources/mapper/lease/LeaseMachineMapper.xml
+++ b/src/main/resources/mapper/lease/LeaseMachineMapper.xml
@@ -55,20 +55,23 @@
         <foreach collection="ids" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
-        <choose>
-            <when test="coin != null and coin != ''">
-                AND (sub.coin LIKE CONCAT('%', #{coin}, '%')
-                <if test="algorithm != null and algorithm != ''">
-                    AND sub.algorithm LIKE CONCAT('%', #{algorithm}, '%')
-                </if>
-                )
-            </when>
-            <otherwise>
-                <if test="algorithm != null and algorithm != ''">
-                    AND sub.algorithm LIKE CONCAT('%', #{algorithm}, '%')
-                </if>
-            </otherwise>
-        </choose>
+          <if test="keyword != null and keyword != ''">
+              AND (sub.coin LIKE CONCAT('%', #{keyword}, '%') OR sub.algorithm LIKE CONCAT('%', #{keyword}, '%'))
+          </if>
+<!--        <choose>-->
+<!--            <when test="coin != null and coin != ''">-->
+<!--                AND (sub.coin LIKE CONCAT('%', #{coin}, '%')-->
+<!--                <if test="algorithm != null and algorithm != ''">-->
+<!--                    AND sub.algorithm LIKE CONCAT('%', #{algorithm}, '%')-->
+<!--                </if>-->
+<!--                )-->
+<!--            </when>-->
+<!--            <otherwise>-->
+<!--                <if test="algorithm != null and algorithm != ''">-->
+<!--                    AND sub.algorithm LIKE CONCAT('%', #{algorithm}, '%')-->
+<!--                </if>-->
+<!--            </otherwise>-->
+<!--        </choose>-->
         GROUP BY ls.id, ls.name, ls.image, ls.description, ls.sale_number
         ORDER BY ls.fee_rate DESC, ls.sale_number DESC
     </select>