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}, '%')
- AND fyr.source_name =#{beanConsumeArticle.articleName}
+ AND fyr.source_name LIKE CONCAT('%',#{beanConsumeArticle.articleName}, '%')
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 @@