czg_team
/
video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
张松 2025-01-09 15:46:31 +08:00
parent 63426cf962 c6dacc49aa
commit 04bc369859
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/sqx/modules/pay/controller/app/AppCashController.java
View File

@ -98,10 +98,18 @@ public class AppCashController {
Calendar calendar = Calendar.getInstance();
int hour = calendar.get(Calendar.HOUR_OF_DAY);
if (hour < 8 || hour > 18) {
return Result.error("提现时间为每天8:00-18:00");
CommonInfo info = commonInfoService.findOne(930);
if (info == null) {
return Result.error("当前时间段未开启提现功能");
}
String[] timeScope = info.getValue().split("~");
String today = DateUtil.today();
Date beginTime = DateUtil.parseDateTime(today + " " + timeScope[0]);
Date endTime = DateUtil.parseDateTime(today + " " + timeScope[1]);
boolean in = DateUtil.isIn(new Date(), beginTime, endTime);
if (!in) {
return Result.error(StrUtil.format("提现时间为每天{}", info.getValue()));
}
double money = Double.parseDouble(commonInfoService.findOne(929).getValue());
Double v = cashOutService.queryUserTodayCashAmount(userId);
if (v == null) {
@ -151,5 +159,17 @@ public class AppCashController {
return userMoneyDetailsService.queryUserMoneyDetails(page, limit, null, userId, classify, type, moneyType, 0);
}
public static void main(String[] args) {
String[] timeScope = "16:01:02~18:01:02".split("~");
String today = DateUtil.today();
Date beginTime = DateUtil.parseDateTime(today + " " + timeScope[0]);
Date endTime = DateUtil.parseDateTime(today + " " + timeScope[1]);
boolean in = DateUtil.isIn(new Date(), beginTime, endTime);
if (in) {
System.out.println("在活动时间内");
} else {
System.err.println("外");
}
}
}