这是一次拉取

src/main/java/com/example/demo/Export/ExportServiceImpl.java

@@ -119,6 +119,11 @@ public class ExportServiceImpl implements ExportService {
             onlineDTO.setUrl("");
             onlineDTO.setFileName(generateFileName("在线明细", adminName));
             onlineDTO.setDataNum(0);
+        } else if(dto instanceof ArticleDTO articleDTO){
+            articleDTO.setAccount(Integer.valueOf(account));
+            articleDTO.setUrl("");
+            articleDTO.setFileName(generateFileName("文章明细", adminName));
+            articleDTO.setDataNum(0);
         }
     }
 

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("精网号不能为空");

src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java

@@ -327,9 +327,6 @@ public class ExportExcelServiceImpl implements ExportExcelService {
                 Page page = new Page();
                 page.setPageNum(1);
                 page.setPageSize(PAGE_SIZE);
-                if (exportType.equals("goldDetail")){
-
-                }
                 Integer totalCount = 0;
                 boolean hasMore = true;
 

src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java

@@ -1,6 +1,8 @@
 package com.example.demo.serviceImpl.coin;
 
 import com.example.demo.domain.entity.UserGoldRecord;
+import com.example.demo.domain.vo.bean.BeanUserCard;
+import com.example.demo.mapper.bean.BeanUserMapper;
 import com.example.demo.mapper.coin.MarketMapper;
 import com.example.demo.mapper.coin.RechargeMapper;
 import com.example.demo.mapper.coin.UserMapper;
@@ -39,6 +41,9 @@ public class RechargeServiceImpl implements RechargeService {
     @Autowired
     private MarketMapper marketMapper;
 
+    @Autowired
+    private BeanUserMapper beanUserMapper;
+
 
 
     //查询所有充值
@@ -107,10 +112,12 @@ public class RechargeServiceImpl implements RechargeService {
         {
             return Result.error("精网号位数小于8位或大于8位");
         }
-        GoldUser goldUser = userMapper.selectUser(rechargeUser.getJwcode().toString());
-        if(goldUser==null){
-            return Result.error("用户不存在");
+
+        BeanUserCard user = beanUserMapper.userCard(String.valueOf(rechargeUser.getJwcode()));
+        if(user==null){
+            return Result.error("用户查找不到");
         }
+
         UserGoldRecord userGoldRecord = new UserGoldRecord();
 
         // 获取当前时间戳部分

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 != ''">

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">