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-05-20 14:26:56 +08:00
parent 5b5637b7d3
commit 81b577ee19
3 changed files with 107 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/rj/controller/LbDepartmentUserController.java
View File

@@ -129,8 +129,11 @@ public class LbDepartmentUserController {
@Parameter(description = "是否活跃：1活跃 0不活跃") @RequestParam(name = "is_active", required = false) Integer isActive,
@Parameter(description = "加入日期，查询 join_date 大于该日期的数据")
@RequestParam(name = "join_date", required = false)
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate joinDate) {
Map<String, Object> result = lbDepartmentUserService.getDepartmentUserTree(tenantId, isActive, joinDate);
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate joinDate,
@Parameter(description = "最后成交日期，查询 last_trade_date 大于该日期的数据")
@RequestParam(name = "last_trade_date", required = false)
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate lastTradeDate) {
Map<String, Object> result = lbDepartmentUserService.getDepartmentUserTree(tenantId, isActive, joinDate, lastTradeDate);
Boolean success = (Boolean) result.get("success");
if (success != null && success) {
return ResponseEntity.ok(result);

2
src/main/java/com/rj/service/ILbDepartmentUserService.java
View File

@@ -40,5 +40,5 @@ public interface ILbDepartmentUserService extends IService<LbDepartmentUser> {
/**
* 按租户查询部门用户并构建父子树（parent_id 对应 lb_user.pid）。
*/
Map<String, Object> getDepartmentUserTree(String tenantId, Integer isActive, LocalDate joinDate);
Map<String, Object> getDepartmentUserTree(String tenantId, Integer isActive, LocalDate joinDate, LocalDate lastTradeDate);
}

127
src/main/java/com/rj/service/impl/LbDepartmentUserServiceImpl.java
View File

@@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.rj.entity.LbDailyUserTrade;
import com.rj.entity.LbDepartmentUser;
import com.rj.entity.LbOrderRow;
import com.rj.entity.LbPurchaseApply;
import com.rj.entity.LbUser;
import com.rj.mapper.LbDailyUserTradeMapper;
import com.rj.mapper.LbDepartmentUserMapper;
import com.rj.mapper.LbOrderRowMapper;
import com.rj.mapper.LbPurchaseApplyMapper;
import com.rj.mapper.LbUserMapper;
import com.rj.service.ILbDepartmentUserService;
@@ -16,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashSet;
@@ -24,6 +25,8 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -35,12 +38,21 @@ public class LbDepartmentUserServiceImpl extends ServiceImpl<LbDepartmentUserMap
private static final int PURCHASE_APPLY_BATCH_SIZE = 200;
private static final String ORDER_DATA_TYPE_DETAIL = "detail_data";
private static final DateTimeFormatter ORDER_DAY_TIME_FMT =
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
private static final DateTimeFormatter ORDER_DAY_FMT = DateTimeFormatter.ofPattern("yyyy-MM-dd");
@Autowired
private LbDailyUserTradeMapper lbDailyUserTradeMapper;
@Autowired
private LbPurchaseApplyMapper lbPurchaseApplyMapper;
@Autowired
private LbUserMapper lbUserMapper;
@Autowired
private LbOrderRowMapper lbOrderRowMapper;
@Override
public Map<String, Object> add(LbDepartmentUser entity) {
@@ -458,28 +470,23 @@ public class LbDepartmentUserServiceImpl extends ServiceImpl<LbDepartmentUserMap
}
Set<String> tradeActiveUserIds = new HashSet<>();
Map<String, LbDailyUserTrade> latestTradeByUserId = new HashMap<>();
List<LbDailyUserTrade> tradeUserRows = lbDailyUserTradeMapper.selectList(
new LambdaQueryWrapper<LbDailyUserTrade>()
.eq(LbDailyUserTrade::getTenantId, tenantIdTrim)
.isNotNull(LbDailyUserTrade::getUserId)
.select(LbDailyUserTrade::getUserId,
LbDailyUserTrade::getReportDate,
LbDailyUserTrade::getDailyBuyAmt));
if (tradeUserRows != null) {
for (LbDailyUserTrade row : tradeUserRows) {
String tradeUserId = trimToNull(row.getUserId());
if (tradeUserId == null) {
Map<String, LbOrderRow> latestOrderByBuyerId = new HashMap<>();
List<LbOrderRow> orderRows = lbOrderRowMapper.selectList(
new LambdaQueryWrapper<LbOrderRow>()
.eq(LbOrderRow::getTenantId, tenantIdTrim)
.eq(LbOrderRow::getDataType, ORDER_DATA_TYPE_DETAIL)
.isNotNull(LbOrderRow::getBuyerId)
.isNotNull(LbOrderRow::getPayTime));
if (orderRows != null) {
for (LbOrderRow row : orderRows) {
if (!isPaidOrderRow(row)) {
continue;
}
tradeActiveUserIds.add(tradeUserId);
if (row.getReportDate() != null
&& row.getDailyBuyAmt() != null
&& row.getDailyBuyAmt().compareTo(BigDecimal.ONE) >= 0) {
LbDailyUserTrade prev = latestTradeByUserId.get(tradeUserId);
if (prev == null || isTradeReportDateNewer(row, prev)) {
latestTradeByUserId.put(tradeUserId, row);
}
String buyerUserId = String.valueOf(row.getBuyerId());
tradeActiveUserIds.add(buyerUserId);
LbOrderRow prev = latestOrderByBuyerId.get(buyerUserId);
if (prev == null || isOrderPayTimeNewer(row, prev)) {
latestOrderByBuyerId.put(buyerUserId, row);
}
}
}
@@ -524,10 +531,12 @@ public class LbDepartmentUserServiceImpl extends ServiceImpl<LbDepartmentUserMap
}
entity.setOrgChain(buildOrgChain(lbUser.getId(), userById));
LbDailyUserTrade latestTrade = latestTradeByUserId.get(userId);
if (latestTrade != null) {
entity.setLastTradeDate(latestTrade.getReportDate());
entity.setLastBuyAmt(latestTrade.getDailyBuyAmt());
LbOrderRow latestOrder = latestOrderByBuyerId.get(userId);
if (latestOrder != null) {
entity.setLastTradeDate(parseOrderTimeToDate(latestOrder.getPayTime()));
entity.setLastBuyAmt(latestOrder.getTotalMoney());
} else {
entity.setLastTradeDate(null);
entity.setLastBuyAmt(null);
@@ -633,7 +642,7 @@ public class LbDepartmentUserServiceImpl extends ServiceImpl<LbDepartmentUserMap
}
@Override
public Map<String, Object> getDepartmentUserTree(String tenantId, Integer isActive, LocalDate joinDate) {
public Map<String, Object> getDepartmentUserTree(String tenantId, Integer isActive, LocalDate joinDate, LocalDate lastTradeDate) {
Map<String, Object> result = new HashMap<>();
try {
if (tenantId == null || tenantId.trim().isEmpty()) {
@@ -651,6 +660,9 @@ public class LbDepartmentUserServiceImpl extends ServiceImpl<LbDepartmentUserMap
if (joinDate != null) {
queryWrapper.gt(LbDepartmentUser::getJoinDate, joinDate);
}
if (lastTradeDate != null) {
queryWrapper.gt(LbDepartmentUser::getLastTradeDate, lastTradeDate);
}
List<LbDepartmentUser> deptUsers = this.list(queryWrapper);
if (deptUsers == null || deptUsers.isEmpty()) {
result.put("success", true);
@@ -802,6 +814,69 @@ public class LbDepartmentUserServiceImpl extends ServiceImpl<LbDepartmentUserMap
return reportDate.isAfter(prevReportDate);
}
private static boolean isPaidOrderRow(LbOrderRow row) {
String payTime = row.getPayTime();
return payTime != null && !payTime.trim().isEmpty();
}
private static boolean isOrderPayTimeNewer(LbOrderRow order, LbOrderRow prev) {
LocalDateTime payTime = parseOrderTime(payTimeOrBuyTime(order));
LocalDateTime prevPayTime = parseOrderTime(payTimeOrBuyTime(prev));
if (payTime == null) {
return false;
}
if (prevPayTime == null) {
return true;
}
int cmp = payTime.compareTo(prevPayTime);
if (cmp != 0) {
return cmp > 0;
}
Long id = order.getId();
Long prevId = prev.getId();
if (id == null) {
return false;
}
if (prevId == null) {
return true;
}
return id > prevId;
}
private static String payTimeOrBuyTime(LbOrderRow row) {
if (row.getPayTime() != null && !row.getPayTime().trim().isEmpty()) {
return row.getPayTime().trim();
}
return row.getBuyTime() == null ? null : row.getBuyTime().trim();
}
private static LocalDateTime parseOrderTime(String timeText) {
if (timeText == null || timeText.isEmpty()) {
return null;
}
try {
return LocalDateTime.parse(timeText, ORDER_DAY_TIME_FMT);
} catch (DateTimeParseException ignored) {
// continue
}
try {
return LocalDate.parse(timeText.substring(0, Math.min(10, timeText.length())), ORDER_DAY_FMT)
.atStartOfDay();
} catch (DateTimeParseException ignored) {
// continue
}
try {
return LocalDateTime.parse(timeText, DateTimeFormatter.ISO_LOCAL_DATE_TIME);
} catch (DateTimeParseException e) {
return null;
}
}
private static LocalDate parseOrderTimeToDate(String timeText) {
LocalDateTime dateTime = parseOrderTime(timeText);
return dateTime == null ? null : dateTime.toLocalDate();
}
/**
* 按最近交易日写入 last_trade_date、last_buy_amt；若新交易日更晚则覆盖，否则保留原值。
*/