moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户活动创建，定时，过期，后天审核==

Browse Source
This commit is contained in:
hokli
2025-05-12 18:46:06 +08:00
parent 976a73fd6e
commit 34313b2697
32 changed files with 729 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
accompany-base/accompany-common/src/main/java/com/accompany/common/status/BusiStatus.java
View File

@@ -944,6 +944,10 @@ public enum BusiStatus {
CP_NAME_CHANGE_EXIST_NOT_EXPIRE(20512, "你需要30天才能更换状态。"),
CP_NAME_CHANGE_APPLY_EXPIRE(20512, "该消息已经失效。"),
CP_CANCEL(20512, "关系已解除，变更申请自动失效。"),
USER_EVENT_AUTH(20513, "你已经不是管理员啦，无法保存该活动。"),
USER_EVENT_DELETE(20513, "活动已经被删除"),
USER_EVENT_BEGIN_SELECT(20513, "超过可选时间范围"),
USER_EVENT_EXIST(20513, "该房间已经申请[时间范围]举办活动了"),
;
private final int value;

5
accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java
View File

@@ -256,7 +256,7 @@ public class Constant {
public static final int ACTIVITY_FIRST_COMMON = 671;
public static final int ACTIVITY_FIRST_CP = 672;
public static final int USER_EVENT = 68;
public static final int USER_EVENT_PUBLISH = 681;
public static final int USER_EVENT_BEGIN = 681;
// --------------- 推送自定义消息类型 ---------------------
public static int PUSH = 70; // 推送消息
@@ -1440,6 +1440,9 @@ public class Constant {
public static final String LUCKY_NUMBER_ACT_CONFIG = "lucky_number_act_config";
public static final String LUCKY_25_GIFT_CONFIG = "lucky_25_gift_config";
public static final String USER_EVENT_CONFIG = "user_event_config";//用户活动扣款金额限制
}
public static class WithDrawStatus {

12
accompany-base/accompany-core/src/main/java/com/accompany/common/utils/DateTimeUtil.java
View File

@@ -1131,4 +1131,16 @@ public class DateTimeUtil {
.withNano(0);
}
public static Date convertToEastEightZone(Date originalDate, String originalZoneId) {
// 1. 将Date转换为Instant
Instant instant = originalDate.toInstant();
// 2. 用原始时区创建ZonedDateTime
ZonedDateTime originalZonedDateTime = instant.atZone(ZoneId.of(originalZoneId));
// 3. 转换为东八区时间
ZonedDateTime eastEightZonedDateTime = originalZonedDateTime.withZoneSameInstant(ZoneId.of("Asia/Shanghai"));
// 4. 如果需要返回Date对象
return Date.from(eastEightZonedDateTime.toInstant());
}
}

1
accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/BillDomainTypeEnum.java
View File

@@ -27,6 +27,7 @@ public enum BillDomainTypeEnum {
NEW_RED_BAG(20, "新红包"),
LUCKY_GIFT(21, "幸运数字礼物"),
BRAVO_GIFT(22, "Bravo礼物"),
USER_EVENT(23, "用户活动"),
;
private int value;

2
accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/BillObjTypeEnum.java
View File

@@ -240,6 +240,8 @@ public enum BillObjTypeEnum {
JOY_GAME_IN(160, "小遊戲收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND, BillDomainTypeEnum.MINI_GAME),
JOY_GAME_OUT(161, "小遊戲支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND, BillDomainTypeEnum.MINI_GAME),
USER_EVENT_PAY_BANNER(162, "用户付费创建用户活动", BillTypeEnum.IN, CurrencyEnum.DIAMOND, BillDomainTypeEnum.USER_EVENT),
USER_EVENT_REFUND_BANNER(163, "用户活动审核失败退款", BillTypeEnum.OUT, CurrencyEnum.DIAMOND, BillDomainTypeEnum.USER_EVENT),
;
BillObjTypeEnum(int value, String desc, BillTypeEnum type, CurrencyEnum currency, BillDomainTypeEnum domain) {

2
accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/I18nAlertEnum.java
View File

@@ -295,6 +295,8 @@ public enum I18nAlertEnum {
BRAVO_GIFT_ALL_ROOM_SCREEN("恭喜{%s}，在{%s}送出 Bravo Gift [{%s}]，赢得了{%s}金币！"),
GUILD_SETTLEMENT_REWARD_TIP("本周期的公会长钻石薪资 {0} 已经发放到你的钱包，请注意查收～"),
USER_EVENT_PASS("你的活动已经创建成功，等待活动开启吧！"),
USER_EVENT_REJECT("根据平台判断，你的活动不符合平台准则。无法成功举行，您可以创建新的活动。"),
LUCKY_NUMBER_HAS_JACKPOT_TIP("你在幸运数字活动中中奖啦！快去领取你的金币！"),
LUCKY_NUMBER_GET_JACKPOT_TIP("恭喜你在幸运数字活动中获得了{0}金币。"),