sion/monisuo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
sion
2026-04-10 01:22:25 +08:00
parent 046744d83b
commit 8d3c3b36df
7 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/it/rattan/monisuo/entity/ColdWallet.java
View File

@@ -1,6 +1,7 @@
package com.it.rattan.monisuo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDateTime;
@@ -26,6 +27,7 @@ public class ColdWallet {
private String network;
/** 是否默认: false-否 true-是 */
@JsonProperty("isDefault")
private Boolean isDefault;
/** 状态: 0-禁用 1-启用 */

8
src/main/java/com/it/rattan/monisuo/service/AssetService.java
View File

@@ -477,10 +477,14 @@ public class AssetService {
referralStats.put("referrals", referralList);
result.put("referralStats", referralStats);
// 6. 福利统计（从 account_flow 查询福利类型记录）
// 6. 福利统计（从 account_flow 按 remark 匹配福利记录：新人首充/邀请奖励/间接推广）
LambdaQueryWrapper<AccountFlow> bonusWrapper = new LambdaQueryWrapper<>();
bonusWrapper.eq(AccountFlow::getUserId, userId)
.eq(AccountFlow::getFlowType, 7)
.eq(AccountFlow::getFlowType, 1)
.and(w -> w
.like(AccountFlow::getRemark, "新人首充")
.or().like(AccountFlow::getRemark, "邀请奖励")
.or().like(AccountFlow::getRemark, "间接推广"))
.orderByDesc(AccountFlow::getCreateTime);
List<AccountFlow> bonusFlows = accountFlowMapper.selectList(bonusWrapper);
BigDecimal totalBonusClaimed = bonusFlows.stream()

2
src/main/resources/application-dev.yml
View File

@@ -10,7 +10,7 @@ spring:
datasource:
username: monisuo
password: JPJ8wYicSGC8aRnk
url: jdbc:mysql://8.155.172.147:3306/monisuo?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
url: jdbc:mysql://8.155.172.147:3306/monisuo?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
driver-class-name: com.mysql.cj.jdbc.Driver
hikari:
minimum-idle: 5

2
src/main/resources/application-prd.yml
View File

@@ -10,7 +10,7 @@ spring:
datasource:
username: root
password: 897admin$$
url: jdbc:mysql://47.97.10.240:3306/spccloud?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
url: jdbc:mysql://47.97.10.240:3306/spccloud?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.jdbc.Driver
initialSize: 1