admin/smartDriveEE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

算单日报表数据

Browse Source
This commit is contained in:
cst61
2026-04-25 20:42:48 +08:00
parent 75f3520e22
commit 8cfa29b30b
6 changed files with 222 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
src/main/java/com/rj/controller/LbDailyUserTradeReportController.java
View File

@@ -12,6 +12,7 @@ import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
@@ -39,8 +40,8 @@ public class LbDailyUserTradeReportController {
if (tradeReport.getId() == null || tradeReport.getId().trim().isEmpty()) {
tradeReport.setId(UUID.randomUUID().toString());
}
if (tradeReport.getYestodaySellAmt() == null) {
tradeReport.setYestodaySellAmt(BigDecimal.ZERO);
if (tradeReport.getYestodayBuyAmt() == null) {
tradeReport.setYestodayBuyAmt(BigDecimal.ZERO);
}
if (tradeReport.getDailySellAmt() == null) {
tradeReport.setDailySellAmt(BigDecimal.ZERO);
@@ -241,4 +242,109 @@ public class LbDailyUserTradeReportController {
return ResponseEntity.internalServerError().body(result);
}
}
@DeleteMapping("/delete/by-date-and-tenant")
@Operation(summary = "按日期和租户删除报表", description = "根据报表日期和租户ID删除当天用户交易报表记录")
public ResponseEntity<Map<String, Object>> deleteByDateAndTenant(
@Parameter(description = "报表日期，格式：yyyy-MM-dd", required = true)
@RequestParam String reportDate,
@Parameter(description = "租户ID", required = true)
@RequestParam String tenantId) {
Map<String, Object> result = new HashMap<>();
try {
if (tenantId == null || tenantId.trim().isEmpty()) {
result.put("success", false);
result.put("message", "tenantId不能为空");
return ResponseEntity.badRequest().body(result);
}
if (reportDate == null || reportDate.trim().isEmpty()) {
result.put("success", false);
result.put("message", "reportDate不能为空");
return ResponseEntity.badRequest().body(result);
}
LocalDate parsedReportDate;
try {
parsedReportDate = LocalDate.parse(reportDate.trim());
} catch (Exception e) {
result.put("success", false);
result.put("message", "报表日期格式错误，请使用 yyyy-MM-dd");
return ResponseEntity.badRequest().body(result);
}
LocalDateTime start = parsedReportDate.atStartOfDay();
LocalDateTime end = parsedReportDate.plusDays(1).atStartOfDay();
LambdaQueryWrapper<LbDailyUserTradeReport> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(LbDailyUserTradeReport::getTenantId, tenantId.trim())
.ge(LbDailyUserTradeReport::getReportDate, start)
.lt(LbDailyUserTradeReport::getReportDate, end);
long deleteCount = lbDailyUserTradeReportService.count(queryWrapper);
if (deleteCount == 0) {
result.put("success", true);
result.put("message", "未匹配到可删除记录");
result.put("deleteCount", 0);
return ResponseEntity.ok(result);
}
boolean success = lbDailyUserTradeReportService.remove(queryWrapper);
if (success) {
result.put("success", true);
result.put("message", "删除成功");
result.put("deleteCount", deleteCount);
return ResponseEntity.ok(result);
}
result.put("success", false);
result.put("message", "删除失败");
return ResponseEntity.badRequest().body(result);
} catch (Exception e) {
result.put("success", false);
result.put("message", "删除异常：" + e.getMessage());
return ResponseEntity.internalServerError().body(result);
}
}
@PostMapping("/calculate-report-sum/by-date-and-tenant")
@Operation(summary = "按日期和租户汇总报表", description = "根据报表日期和租户ID汇总报表字段并新增一条 report_sum 记录")
public ResponseEntity<Map<String, Object>> calculateReportSumByDateAndTenant(
@Parameter(description = "报表日期，格式：yyyy-MM-dd", required = true)
@RequestParam String reportDate,
@Parameter(description = "租户ID", required = true)
@RequestParam String tenantId) {
Map<String, Object> result = new HashMap<>();
try {
if (tenantId == null || tenantId.trim().isEmpty()) {
result.put("success", false);
result.put("message", "tenantId不能为空");
return ResponseEntity.badRequest().body(result);
}
if (reportDate == null || reportDate.trim().isEmpty()) {
result.put("success", false);
result.put("message", "reportDate不能为空");
return ResponseEntity.badRequest().body(result);
}
LocalDate parsedReportDate;
try {
parsedReportDate = LocalDate.parse(reportDate.trim());
} catch (Exception e) {
result.put("success", false);
result.put("message", "报表日期格式错误，请使用 yyyy-MM-dd");
return ResponseEntity.badRequest().body(result);
}
Map<String, Object> serviceResult = lbDailyUserTradeReportService
.calculateReportSumByDateAndTenant(parsedReportDate, tenantId.trim());
Boolean success = (Boolean) serviceResult.get("success");
if (Boolean.TRUE.equals(success)) {
return ResponseEntity.ok(serviceResult);
}
return ResponseEntity.badRequest().body(serviceResult);
} catch (Exception e) {
result.put("success", false);
result.put("message", "汇总异常：" + e.getMessage());
return ResponseEntity.internalServerError().body(result);
}
}
}

4
src/main/java/com/rj/entity/LbDailyUserTradeReport.java
View File

@@ -41,8 +41,8 @@ public class LbDailyUserTradeReport implements Serializable {
private String nickname;
@Schema(description = "昨日买入金额")
@TableField("yestoday_sell_amt")
private BigDecimal yestodaySellAmt;
@TableField("yestoday_buy_amt")
private BigDecimal yestodayBuyAmt;
@Schema(description = "当日卖出金额")
@TableField("daily_sell_amt")

4
src/main/java/com/rj/service/ILbDailyUserTradeReportService.java
View File

@@ -3,10 +3,14 @@ package com.rj.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.rj.entity.LbDailyUserTradeReport;
import java.time.LocalDate;
import java.util.Map;
/**
* <p>
* 当天用户交易报表 服务类
* </p>
*/
public interface ILbDailyUserTradeReportService extends IService<LbDailyUserTradeReport> {
Map<String, Object> calculateReportSumByDateAndTenant(LocalDate reportDate, String tenantId);
}

69
src/main/java/com/rj/service/impl/LbDailyUserTradeReportServiceImpl.java
View File

@@ -1,11 +1,19 @@
package com.rj.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.rj.entity.LbDailyUserTradeReport;
import com.rj.mapper.LbDailyUserTradeReportMapper;
import com.rj.service.ILbDailyUserTradeReportService;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
/**
* <p>
* 当天用户交易报表 服务实现类
@@ -14,4 +22,65 @@ import org.springframework.stereotype.Service;
@Service
public class LbDailyUserTradeReportServiceImpl extends ServiceImpl<LbDailyUserTradeReportMapper, LbDailyUserTradeReport>
implements ILbDailyUserTradeReportService {
private static final String DATA_TYPE_REPORT_SUM = "report_sum";
@Override
public Map<String, Object> calculateReportSumByDateAndTenant(LocalDate reportDate, String tenantId) {
Map<String, Object> result = new HashMap<>();
LocalDateTime start = reportDate.atStartOfDay();
LocalDateTime end = reportDate.plusDays(1).atStartOfDay();
LambdaQueryWrapper<LbDailyUserTradeReport> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(LbDailyUserTradeReport::getTenantId, tenantId)
.ge(LbDailyUserTradeReport::getReportDate, start)
.lt(LbDailyUserTradeReport::getReportDate, end)
.ne(LbDailyUserTradeReport::getDataType, DATA_TYPE_REPORT_SUM);
BigDecimal yestodayBuyAmt = BigDecimal.ZERO;
BigDecimal dailySellAmt = BigDecimal.ZERO;
BigDecimal dailyBuyAmt = BigDecimal.ZERO;
BigDecimal serviceAmt = BigDecimal.ZERO;
BigDecimal diffAmt = BigDecimal.ZERO;
BigDecimal dikouAmt = BigDecimal.ZERO;
for (LbDailyUserTradeReport item : list(queryWrapper)) {
yestodayBuyAmt = yestodayBuyAmt.add(defaultZero(item.getYestodayBuyAmt()));
dailySellAmt = dailySellAmt.add(defaultZero(item.getDailySellAmt()));
dailyBuyAmt = dailyBuyAmt.add(defaultZero(item.getDailyBuyAmt()));
serviceAmt = serviceAmt.add(defaultZero(item.getServiceAmt()));
diffAmt = diffAmt.add(defaultZero(item.getDiffAmt()));
dikouAmt = dikouAmt.add(defaultZero(item.getDikouAmt()));
}
LbDailyUserTradeReport summary = new LbDailyUserTradeReport();
summary.setId(UUID.randomUUID().toString());
summary.setTenantId(tenantId);
summary.setDataType(DATA_TYPE_REPORT_SUM);
summary.setReportDate(start);
summary.setYestodayBuyAmt(yestodayBuyAmt);
summary.setDailySellAmt(dailySellAmt);
summary.setDailyBuyAmt(dailyBuyAmt);
summary.setServiceAmt(serviceAmt);
summary.setDiffAmt(diffAmt);
summary.setDikouAmt(dikouAmt);
summary.setDescContent("系统汇总记录");
summary.setCreatedAt(LocalDateTime.now());
summary.setUpdatedAt(LocalDateTime.now());
boolean success = save(summary);
result.put("success", success);
if (success) {
result.put("message", "汇总成功");
result.put("data", summary);
return result;
}
result.put("message", "汇总失败");
return result;
}
private BigDecimal defaultZero(BigDecimal value) {
return value == null ? BigDecimal.ZERO : value;
}
}

46
src/main/java/com/rj/service/impl/LbDailyUserTradeServiceImpl.java
View File

@@ -99,8 +99,8 @@ public class LbDailyUserTradeServiceImpl extends ServiceImpl<LbDailyUserTradeMap
LambdaQueryWrapper<LbDailyUserTrade> yesterdayWrapper = new LambdaQueryWrapper<>();
yesterdayWrapper.eq(LbDailyUserTrade::getTenantId, normalizedTenantId)
.eq(LbDailyUserTrade::getReportDate, yesterday)
.eq(LbDailyUserTrade::getUserId, trade.getUserId());
.eq(LbDailyUserTrade::getReportDate, yesterday);
// .eq(LbDailyUserTrade::getUserId, trade.getUserId());
if (StringUtils.isNotBlank(trade.getNickname())) {
yesterdayWrapper.eq(LbDailyUserTrade::getNickname, trade.getNickname().trim());
}
@@ -108,7 +108,7 @@ public class LbDailyUserTradeServiceImpl extends ServiceImpl<LbDailyUserTradeMap
.orderByDesc(LbDailyUserTrade::getUpdatedAt)
.last("limit 1");
LbDailyUserTrade lastDateRecord = this.getOne(yesterdayWrapper, false);
BigDecimal yestodaySellAmt = lastDateRecord == null || lastDateRecord.getDailyBuyAmt() == null
BigDecimal yestodayBuyAmt = lastDateRecord == null || lastDateRecord.getDailyBuyAmt() == null
? BigDecimal.ZERO
: lastDateRecord.getDailyBuyAmt();
@@ -117,12 +117,13 @@ public class LbDailyUserTradeServiceImpl extends ServiceImpl<LbDailyUserTradeMap
report.setTenantId(normalizedTenantId);
report.setUserId(trade.getUserId());
report.setNickname(trade.getNickname());
report.setYestodaySellAmt(yestodaySellAmt);
report.setYestodayBuyAmt(yestodayBuyAmt);
report.setDailySellAmt(dailySellAmt);
report.setDailyBuyAmt(dailyBuyAmt);
report.setServiceAmt(dailyBuyAmt.multiply(SERVICE_RATE));
report.setDiffAmt(diffAmt);
report.setReportDate(reportDate.atStartOfDay());
report.setDataType("report_detail");
report.setCreatedAt(now);
report.setUpdatedAt(now);
reportList.add(report);
@@ -395,15 +396,23 @@ public class LbDailyUserTradeServiceImpl extends ServiceImpl<LbDailyUserTradeMap
String tenantId = defaultTenantId == null ? "" : defaultTenantId;
String userId = readString(row, headerMap.get("userId"), formatter);
String nickname = readString(row, headerMap.get("nickname"), formatter);
if (tenantId.isEmpty()) {
return null;
}
LbDailyUserTrade matchedTrade = null;
if (StringUtils.isBlank(userId) && StringUtils.isNotBlank(nickname)) {
matchedTrade = findLatestTradeByNickname(tenantId, nickname);
if (matchedTrade != null && StringUtils.isNotBlank(matchedTrade.getUserId())) {
userId = matchedTrade.getUserId();
}
}
if (userId.isEmpty()) {
userId = nickname;
}
if (userId.isEmpty()) {
userId = "AUTO_" + UUID.randomUUID().toString().replace("-", "");
}
if (tenantId.isEmpty()) {
return null;
}
LbDailyUserTrade trade = new LbDailyUserTrade();
trade.setId(UUID.randomUUID().toString());
@@ -412,8 +421,18 @@ public class LbDailyUserTradeServiceImpl extends ServiceImpl<LbDailyUserTradeMap
trade.setNickname(nickname);
trade.setDailySellAmt(readDecimal(row, headerMap.get("dailySellAmt"), formatter));
trade.setDailyBuyAmt(readDecimal(row, headerMap.get("dailyBuyAmt"), formatter));
trade.setPromoterId(readString(row, headerMap.get("promoterId"), formatter));
trade.setPromoterName(readString(row, headerMap.get("promoterName"), formatter));
String promoterId = readString(row, headerMap.get("promoterId"), formatter);
String promoterName = readString(row, headerMap.get("promoterName"), formatter);
if (matchedTrade != null) {
if (StringUtils.isBlank(promoterId) && StringUtils.isNotBlank(matchedTrade.getPromoterId())) {
promoterId = matchedTrade.getPromoterId();
}
if (StringUtils.isBlank(promoterName) && StringUtils.isNotBlank(matchedTrade.getPromoterName())) {
promoterName = matchedTrade.getPromoterName();
}
}
trade.setPromoterId(promoterId);
trade.setPromoterName(promoterName);
trade.setDescContent(readString(row, headerMap.get("descContent"), formatter));
BigDecimal sell = trade.getDailySellAmt() == null ? BigDecimal.ZERO : trade.getDailySellAmt();
@@ -430,6 +449,15 @@ public class LbDailyUserTradeServiceImpl extends ServiceImpl<LbDailyUserTradeMap
return trade;
}
private LbDailyUserTrade findLatestTradeByNickname(String tenantId, String nickname) {
LambdaQueryWrapper<LbDailyUserTrade> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(LbDailyUserTrade::getTenantId, tenantId)
.eq(LbDailyUserTrade::getNickname, nickname.trim())
.orderByDesc(LbDailyUserTrade::getUpdatedAt)
.last("limit 1");
return this.getOne(wrapper, false);
}
private boolean isEmptyRow(Row row, DataFormatter formatter) {
for (Cell cell : row) {
if (!formatter.formatCellValue(cell).trim().isEmpty()) {

4
src/main/resources/mapper/LbDailyUserTradeReportMapper.xml
View File

@@ -7,7 +7,7 @@
<result column="tenant_id" property="tenantId"/>
<result column="user_id" property="userId"/>
<result column="nickname" property="nickname"/>
<result column="yestoday_sell_amt" property="yestodaySellAmt"/>
<result column="yestoday_buy_amt" property="yestodayBuyAmt"/>
<result column="daily_sell_amt" property="dailySellAmt"/>
<result column="daily_buy_amt" property="dailyBuyAmt"/>
<result column="service_amt" property="serviceAmt"/>
@@ -21,7 +21,7 @@
</resultMap>
<sql id="Base_Column_List">
id, tenant_id, user_id, nickname, yestoday_sell_amt, daily_sell_amt, daily_buy_amt, service_amt, diff_amt, dikou_amt,
id, tenant_id, user_id, nickname, yestoday_buy_amt, daily_sell_amt, daily_buy_amt, service_amt, diff_amt, dikou_amt,
desc_content, data_type, created_at, updated_at, report_date
</sql>