From 8b50783248f0d14799a51b0e42f695d803c181a9 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Fri, 8 Aug 2025 14:48:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E6=A0=87=E9=A2=98+=E4=BD=9C?=
 =?UTF-8?q?=E8=80=85=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=B6=88?=
 =?UTF-8?q?=E8=B4=B9=E9=87=91=E8=B1=86=E6=95=B0=E9=87=8F=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=EF=BC=8C=E9=A2=91=E9=81=93=E6=8E=92=E9=99=A4=E7=A9=BA=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java | 11 +++++++++++
 src/main/resources/jindouMapper/BeanConsumeMapper.xml         |  4 ++--
 src/main/resources/liveMapper/LiveMapper.xml                  |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java
index e97675c..a3b1724 100644
--- a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java
@@ -4,6 +4,7 @@ import com.example.demo.Util.BaseDES2;
 import com.example.demo.domain.vo.bean.*;
 import com.example.demo.domain.vo.coin.*;
 import com.example.demo.mapper.bean.BeanConsumeMapper;
+import com.example.demo.mapper.bean.BeanUserMapper;
 import com.example.demo.mapper.coin.UserMapper;
 import com.example.demo.mapper.live.LiveMapper;
 import com.example.demo.service.bean.BeanConsumeService;
@@ -47,6 +48,8 @@ public class BeanConsumeServiceImpl implements BeanConsumeService {
     // 构建接口URL及参数
     @Value("${bean.consume.url}")
     String apiUrl;
+    @Autowired
+    private BeanUserMapper beanUserMapper;
 
     //获取消费用户分部
     @Override
@@ -65,6 +68,14 @@ public class BeanConsumeServiceImpl implements BeanConsumeService {
     @Override
     public Result reduce(BeanConsume consume) {
 
+            //获取用户当前余额
+            BeanUserCard user= beanUserMapper.userCard(consume.getJwcode());
+            if (user.getFreeBean() < consume.getFreeBean()) {
+                return Result.error("用户免费金豆余额不足");
+            }
+            if (user.getPermanentBean() < consume.getPermanentBean()) {
+                return Result.error("用户永久金豆余额不足");
+            }
             // 验证精网号是否有效
             if (consume.getJwcode() == null || consume.getJwcode().isEmpty()) {
                 return Result.error("精网号不能为空");
diff --git a/src/main/resources/jindouMapper/BeanConsumeMapper.xml b/src/main/resources/jindouMapper/BeanConsumeMapper.xml
index 1f2b051..96c7590 100644
--- a/src/main/resources/jindouMapper/BeanConsumeMapper.xml
+++ b/src/main/resources/jindouMapper/BeanConsumeMapper.xml
@@ -229,10 +229,10 @@
                 AND (SELECT fm2.nickname
                 FROM fx_member fm2
                 WHERE fm2.jwcode = fyr.source_jwcode
-                LIMIT 1)=#{beanConsumeArticle.author}
+                LIMIT 1)LIKE CONCAT('%',#{beanConsumeArticle.author}, '%')
             </if>
             <if test="beanConsumeArticle.ArticleName != null and beanConsumeArticle.ArticleName != ''">
-                AND fyr.source_name =#{beanConsumeArticle.articleName}
+                AND fyr.source_name LIKE CONCAT('%',#{beanConsumeArticle.articleName}, '%')
             </if>
 
             <if test="beanConsumeArticle.articleId != null and beanConsumeArticle.articleId != ''">
diff --git a/src/main/resources/liveMapper/LiveMapper.xml b/src/main/resources/liveMapper/LiveMapper.xml
index 9d5d10f..947fe38 100644
--- a/src/main/resources/liveMapper/LiveMapper.xml
+++ b/src/main/resources/liveMapper/LiveMapper.xml
@@ -61,7 +61,7 @@
     </select>
     <!--获取直播频道列表-->
     <select id="getLiveChannel" resultType="java.lang.String">
-        select distinct title from live_pindao
+        select distinct title from live_pindao where title is not null and title != ''
     </select>
     <!--计算直播消费金豆合计数-->
     <select id="selectSumLiveBy" resultType="com.example.demo.domain.vo.bean.BeanConsumeGold">