shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123333

Browse Source
This commit is contained in:
张良(004796)
2024-03-15 17:02:47 +08:00
parent 00e5cfb288
commit 224f17d404
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java
View File

@@ -57,7 +57,7 @@ public enum SystemConfigEnum {
SMS_CODE_ADMIN("", "万能验证码",SystemConfigGroupEnum.SYSTEM), SMS_CODE_ADMIN("", "万能验证码",SystemConfigGroupEnum.SYSTEM),
PASSWORD_ADMIN("", "公用密码",SystemConfigGroupEnum.SYSTEM), PASSWORD_ADMIN("", "公用密码",SystemConfigGroupEnum.SYSTEM),
COS_DOMAIN("http://nono-1257812345.cos.ap-shanghai.myqcloud.com/", "文件系统域名前缀",SystemConfigGroupEnum.SYSTEM), COS_DOMAIN("http://nono-1257812345.cos.ap-shanghai.myqcloud.com/", "文件系统域名前缀",SystemConfigGroupEnum.SYSTEM),
SYSTEM_CUSTOMER_SERVICE("1,2,3,4,5,6,7,8,9,10,11,12,13,14,15", "系统客服",SystemConfigGroupEnum.SYSTEM), SYSTEM_CUSTOMER_SERVICE("2,4", "系统客服",SystemConfigGroupEnum.SYSTEM),
WS_SOCKET_URL("ws://localhost:8080/ws?token=%s&room_id=%s", "ws通讯地址",SystemConfigGroupEnum.SYSTEM), WS_SOCKET_URL("ws://localhost:8080/ws?token=%s&room_id=%s", "ws通讯地址",SystemConfigGroupEnum.SYSTEM),
; ;

4
ruoyi-cai/src/main/java/com/ruoyi/cai/manager/HomeManager.java
View File

@@ -18,6 +18,7 @@ import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@@ -93,6 +94,9 @@ public class HomeManager {
Collections.shuffle(vos); Collections.shuffle(vos);
Integer pageNum = pageQuery.getPageNum(); Integer pageNum = pageQuery.getPageNum();
int startIndex = (pageNum - 1) * pageQuery.getPageSize(); int startIndex = (pageNum - 1) * pageQuery.getPageSize();
if(startIndex > vos.size()){
return Collections.emptyList();
}
int endIndex = Math.min(startIndex+pageQuery.getPageSize(), vos.size()); int endIndex = Math.min(startIndex+pageQuery.getPageSize(), vos.size());
return vos.subList(startIndex, endIndex); return vos.subList(startIndex, endIndex);
} }

4
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java
View File

@@ -249,7 +249,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
log.error("分销失败，参数错误 amount={},accountChangeEnum={}",amount,accountChangeEnum); log.error("分销失败，参数错误 amount={},accountChangeEnum={}",amount,accountChangeEnum);
return false; return false;
} }
baseMapper.incsCoin(userId, amount); baseMapper.incsIncomeCoin(userId, amount);
if(ConsumeLogType.GIFT.getCode().equals(consumeLog.getType())){ // 礼物 if(ConsumeLogType.GIFT.getCode().equals(consumeLog.getType())){ // 礼物
Gift gift = giftService.getById(consumeLog.getBusinessParam()); Gift gift = giftService.getById(consumeLog.getBusinessParam());
accountChangeLogService.saveLogNoAdmin(userId,user.getUsercode(), accountChangeEnum,amount,consumeLog.getTraceId(), accountChangeLogService.saveLogNoAdmin(userId,user.getUsercode(), accountChangeEnum,amount,consumeLog.getTraceId(),
@@ -368,7 +368,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
} }
if(incsIncomeCoin > 0){ if(incsIncomeCoin > 0){
payIncome = payIncome - incsIncomeCoin; payIncome = payIncome - incsIncomeCoin;
baseMapper.incsCoin(callUserData.getId(), incsIncomeCoin); baseMapper.incsIncomeCoin(callUserData.getId(), incsIncomeCoin);
} }
} }
Long amountReal = payCoin + payIncome; // 实际支付的金额 Long amountReal = payCoin + payIncome; // 实际支付的金额

2
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserCameraAuditServiceImpl.java
View File

@@ -58,7 +58,7 @@ public class UserCameraAuditServiceImpl extends ServiceImpl<UserCameraAuditMappe
if(userCameraAudit != null){ if(userCameraAudit != null){
vo = BeanConvertUtil.convertTo(userCameraAudit, CameraAuditVo::new); vo = BeanConvertUtil.convertTo(userCameraAudit, CameraAuditVo::new);
} else { } else {
int actionType = RandomUtil.randomInt(0, 4); int actionType = RandomUtil.randomInt(1, 5);
vo = new CameraAuditVo(); vo = new CameraAuditVo();
vo.setUserId(userId); vo.setUserId(userId);
vo.setActionType(actionType); vo.setActionType(actionType);

2
ruoyi-cai/src/main/resources/mapper/cai/AnchorMapper.xml
View File

@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from cai_user t1 from cai_user t1
join cai_anchor t2 on t1.id = t2.user_id join cai_anchor t2 on t1.id = t2.user_id
join cai_user_online t3 on t1.id = t3.user_id join cai_user_online t3 on t1.id = t3.user_id
where t1.status = 0 and t1.is_anchor = 1 and t2.index_display = 1 and t1.id > 100 where t1.status = 0 and t1.is_anchor = 1 and t2.index_display = 1 and t1.usercode > 100
<if test="query.cityId != null and query.cityId != ''"> <if test="query.cityId != null and query.cityId != ''">
and t1.city_id = #{query.cityId} and t1.city_id = #{query.cityId}
</if> </if>