Commit Graph

314 Commits

Author SHA1 Message Date
Tankaikai
dd10140147 Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	src/main/java/com/sqx/modules/job/task/TempOrdersTask.java
2024-12-26 18:18:03 +08:00
谭凯凯
48a152085b 订单刷数据 2024-12-26 18:16:29 +08:00
73ef19ead6 缓存 2024-12-26 18:11:15 +08:00
张松
e97df47287 fix: 订单状态定时任务增加失败状态 2024-12-26 17:53:29 +08:00
张松
e7e0d6d484 Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	src/main/java/com/sqx/modules/job/task/TempOrdersTask.java
2024-12-26 17:42:10 +08:00
张松
3b925f5070 Merge branch 'refs/heads/dev' into test
# Conflicts:
#	src/main/java/com/sqx/modules/job/task/TempOrdersTask.java
2024-12-26 17:41:42 +08:00
张松
54778f4078 fix: 订单状态定时任务增加失败状态 2024-12-26 17:41:06 +08:00
Tankaikai
2f23e93b03 Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	src/main/java/com/sqx/modules/job/task/TempOrdersTask.java
2024-12-26 17:39:36 +08:00
谭凯凯
b875469beb 订单刷数据测试 2024-12-26 17:38:13 +08:00
张松
372754bb65 Merge remote-tracking branch 'origin/test' into test 2024-12-26 17:13:20 +08:00
张松
4f138ac57b Merge branch 'refs/heads/dev' into test 2024-12-26 17:13:13 +08:00
张松
3f8ca43b71 fix: 订单状态定时任务增加失败状态 2024-12-26 17:12:40 +08:00
Tankaikai
f681af7fd8 Merge remote-tracking branch 'origin/test' into test 2024-12-26 17:00:13 +08:00
谭凯凯
93b591fac1 领取满签奖励 2024-12-26 17:00:07 +08:00
张松
85818ffd3d fix: 更改提示 2024-12-26 16:52:47 +08:00
张松
b9564d6e74 fix: 更改提示 2024-12-26 16:52:18 +08:00
张松
0289392f3c Merge remote-tracking branch 'origin/test' into test 2024-12-26 16:24:41 +08:00
张松
b28a5eedff feat: 修改回调前缀 2024-12-26 16:19:51 +08:00
谭凯凯
17b125d14d 提现申请审核 2024-12-26 16:02:04 +08:00
Tankaikai
6afe946441 Merge remote-tracking branch 'origin/test' into test 2024-12-26 15:56:54 +08:00
谭凯凯
82b1526071 提现申请审核 2024-12-26 15:56:49 +08:00
c8cf607a72 swagger 开关 2024-12-26 15:42:53 +08:00
2a25a4792b 注册 渠道不存在时 2024-12-26 15:02:24 +08:00
张松
5f7c225582 Merge branch 'refs/heads/test' into dev 2024-12-26 14:51:18 +08:00
张松
5f68d4f4ad feat: 体现超限,延缓到明日复审打款 2024-12-26 14:45:34 +08:00
张松
b4cc37b110 feat: 体现超限,延缓到明日复审打款 2024-12-26 14:41:26 +08:00
05d1b39d4a 提现补发 2024-12-26 14:21:19 +08:00
张松
6bed73e48d Merge remote-tracking branch 'origin/test' into test 2024-12-26 14:11:32 +08:00
张松
ff86d3969b feat: updateOrderStatus异步执行方法增加锁,等待异步方法执行完毕 2024-12-26 14:11:21 +08:00
GYJ
5c7e91a563 Merge branch 'test' into dev 2024-12-26 14:06:36 +08:00
谭凯凯
5b632f80d8 签到记录 2024-12-26 14:01:04 +08:00
Tankaikai
16b158e5e1 Merge remote-tracking branch 'origin/test' into test 2024-12-26 13:57:38 +08:00
谭凯凯
70e0d736ba 签到记录 2024-12-26 13:57:27 +08:00
GYJ
d9c1ccee48 修改 api 前缀 2024-12-26 13:40:42 +08:00
a392dc6c59 首次绑定支付宝问题 2024-12-26 13:21:07 +08:00
81ee291c22 绑定账号问题 2024-12-26 13:12:20 +08:00
张松
650b3bc4ea feat: 体现增加每次体现次数上限 2024-12-26 12:59:09 +08:00
ce9d92508e 重复领取问题 2024-12-26 11:27:10 +08:00
112bcc15b9 user表 zhi_fu_bao_name 2024-12-26 11:27:05 +08:00
d89ca7bc3a user表 zhifubao_name 2024-12-26 11:27:02 +08:00
867b3a284e 重复领取问题 2024-12-26 11:25:58 +08:00
1f3de4c9ae user表 zhi_fu_bao_name 2024-12-26 11:05:37 +08:00
36531bd0e6 user表 zhifubao_name 2024-12-26 11:01:48 +08:00
81d823f6ce Merge branch 'test' into dev 2024-12-26 10:48:13 +08:00
1581c3c530 关闭 提现 2024-12-26 10:46:40 +08:00
cdefd711be 提现问题 2024-12-26 10:21:27 +08:00
GYJ
917f7e3a77 Merge branch 'test' into dev 2024-12-26 02:00:40 +08:00
GYJ
6d2e5f0d2a 注册防抖1 2024-12-26 02:00:24 +08:00
GYJ
bacd2694c5 Merge branch 'test' into dev 2024-12-26 01:20:47 +08:00
GYJ
50dab891cc 注册防抖 2024-12-26 01:20:04 +08:00