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

对接3方系统，开通同事特权

Browse Source
This commit is contained in:
cst61
2026-05-16 20:15:57 +08:00
parent 1b811aa8af
commit 9171a93e46
4 changed files with 62 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/rj/service/HxrAdminUserService.java
View File

@@ -44,18 +44,29 @@ public class HxrAdminUserService {
/**
* VIP 到期时间：以 {@code applyDate} 为起算日，若当天为周六、周日则先顺延到下一工作日，再顺延 2 个工作日；
* 时刻与调用时「当前时刻」的时分秒相同（仅调整日期）。
* 时刻与调用时「当前时刻」的时分秒相同（仅调整日期）。用于开通同事特权。
*/
public static LocalDateTime computeVipExpireTime(LocalDate applyDate) {
return computeVipExpireTime(applyDate, 2);
}
/**
* VIP 到期时间：以 {@code applyDate} 为起算日，若当天为周六、周日则先顺延到下一工作日，
* 再顺延 {@code workdaysAfterAlign} 个工作日；时刻与当前时分秒一致。
*/
public static LocalDateTime computeVipExpireTime(LocalDate applyDate, int workdaysAfterAlign) {
if (applyDate == null) {
throw new IllegalArgumentException("applyDate不能为空");
}
if (workdaysAfterAlign < 0) {
throw new IllegalArgumentException("workdaysAfterAlign不能为负");
}
LocalDateTime now = LocalDateTime.now();
LocalDate d = applyDate;
while (IsoWorkdayUtils.isWeekend(d)) {
d = d.plusDays(1);
}
for (int i = 0; i < 2; i++) {
for (int i = 0; i < workdaysAfterAlign; i++) {
d = d.plusDays(1);
while (IsoWorkdayUtils.isWeekend(d)) {
d = d.plusDays(1);

5
src/main/java/com/rj/service/ILbPurchaseApplyService.java
View File

@@ -28,14 +28,15 @@ public interface ILbPurchaseApplyService extends IService<LbPurchaseApply> {
/**
* 按申请日期区间与租户筛选进货申请，对不重复的 {@code apply_phone} 调用 hxrd 用户查询与更新接口，
* 写入 {@code max_order}、VIP/转卖/状态 及 {@code viptime}（当前时间 +2 天，若落在周末则顺延至下周一）。
* 写入 {@code max_order}、VIP/转卖/状态 及 {@code viptime}（周末先对齐到下一工作日，再顺延 3 个工作日）。
*/
Map<String, Object> syncHxrAdminUserVipByApplyDateRange(
LocalDate applyDateStart, LocalDate applyDateEnd, String tenantId, Integer maxOrder);
/**
* 按申请日期区间与租户筛选进货申请，对每条记录的 {@code colleague_phone} 调用 hxrd 用户查询与更新，
* 以 {@code apply_date} 为起算日顺延 2 个自然日写入 {@code viptime} 等 VIP 字段。
* 仅当 {@code colleague_name} 能在 {@code lb_daily_user_trade}（同租户、按 nickname）中查到时才开通；
* 以 {@code apply_date} 为起算日计算 {@code viptime}（周末先对齐到下一工作日，再顺延 2 个工作日）。
*/
Map<String, Object> syncHxrAdminColleagueVipByApplyDateRange(
LocalDate applyDateStart, LocalDate applyDateEnd, String tenantId);

47
src/main/java/com/rj/service/impl/LbPurchaseApplyServiceImpl.java
View File

@@ -12,9 +12,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.rj.dto.hxr.HxrUserRow;
import com.rj.entity.LbDailyUserTrade;
import com.rj.entity.LbDailyUserTradeReport;
import com.rj.entity.LbPurchaseApply;
import com.rj.util.IsoWorkdayUtils;
import com.rj.mapper.LbDailyUserTradeMapper;
import com.rj.mapper.LbDailyUserTradeReportMapper;
import com.rj.mapper.LbPurchaseApplyMapper;
import com.rj.service.HxrAdminUserService;
@@ -45,6 +47,9 @@ public class LbPurchaseApplyServiceImpl
@Autowired
private LbDailyUserTradeReportMapper lbDailyUserTradeReportMapper;
@Autowired
private LbDailyUserTradeMapper lbDailyUserTradeMapper;
@Autowired
private HxrAdminUserService hxrAdminUserService;
@@ -575,7 +580,7 @@ public class LbPurchaseApplyServiceImpl
continue;
}
try {
LocalDateTime vipTime = HxrAdminUserService.computeVipExpireTime(row.getApplyDate());
LocalDateTime vipTime = HxrAdminUserService.computeVipExpireTime(row.getApplyDate(), 3);
String vipTimeStr = HxrAdminUserService.formatVipTime(vipTime);
one.put("viptime", vipTimeStr);
@@ -663,6 +668,26 @@ public class LbPurchaseApplyServiceImpl
return result;
}
Set<String> ApplyUserNames = new HashSet<>();
for (LbPurchaseApply row : rows) {
if (row.getColleagueName() != null && !row.getColleagueName().trim().isEmpty()) {
ApplyUserNames.add(row.getApplyUser().trim());
}
}
Set<String> tradeMatchedNicknames = new HashSet<>();
if (!ApplyUserNames.isEmpty()) {
LambdaQueryWrapper<LbDailyUserTrade> tradeQuery = new LambdaQueryWrapper<>();
tradeQuery.eq(LbDailyUserTrade::getTenantId, tenantId.trim())
.in(LbDailyUserTrade::getNickname, ApplyUserNames)
.select(LbDailyUserTrade::getNickname);
List<LbDailyUserTrade> matchedTrades = lbDailyUserTradeMapper.selectList(tradeQuery);
for (LbDailyUserTrade trade : matchedTrades) {
if (trade.getNickname() != null && !trade.getNickname().trim().isEmpty()) {
tradeMatchedNicknames.add(trade.getNickname().trim());
}
}
}
List<Map<String, Object>> details = new ArrayList<>();
int ok = 0;
int fail = 0;
@@ -670,9 +695,24 @@ public class LbPurchaseApplyServiceImpl
Map<String, Object> one = new HashMap<>();
one.put("applyId", row.getId());
one.put("applyDate", row.getApplyDate());
one.put("colleagueName", row.getColleagueName());
String applyUserName = row.getApplyUser() != null ? row.getApplyUser().trim() : "";
one.put("applyUserName", applyUserName);
String phone = row.getColleaguePhone() != null ? row.getColleaguePhone().trim() : "";
one.put("colleaguePhone", phone);
if (applyUserName.isEmpty()) {
one.put("success", false);
one.put("message", "colleague_name 为空，跳过");
fail++;
details.add(one);
continue;
}
if (!tradeMatchedNicknames.contains(applyUserName)) {
one.put("success", false);
one.put("message", "申请人姓名在 lb_daily_user_trade 中未找到 ，说明今天没进货 ，推荐人不能享受特权，跳过开通特权");
fail++;
details.add(one);
continue;
}
if (phone.isEmpty()) {
one.put("success", false);
one.put("message", "colleague_phone 为空，跳过");
@@ -688,8 +728,7 @@ public class LbPurchaseApplyServiceImpl
continue;
}
try {
LocalDateTime vipTime =
HxrAdminUserService.computeVipExpireTimePlusCalendarDays(row.getApplyDate(), 2);
LocalDateTime vipTime = HxrAdminUserService.computeVipExpireTime(row.getApplyDate());
String vipTimeStr = HxrAdminUserService.formatVipTime(vipTime);
one.put("viptime", vipTimeStr);