wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,745 Commits 107 Branches 0 Tags 48 MiB
Commit Graph

1966 Commits

Author SHA1 Message Date
chenhao 36f8391ce5 Merge pull request 'feat-IRONFANS-212-Robin' (#910) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/910
 2024-12-17 13:56:35 +08:00
Robin 394f7226a0 by Robin at 20241217 2024-12-17 13:56:14 +08:00
wangxinyu 82c89df80f feat:主播涨价降价铁粉刷新 2024-12-17 13:51:59 +08:00
Robin 91ec58186f 1 2024-12-17 13:51:55 +08:00
chenhao d1d8c34cbd Merge pull request 'conf-1000063' (#909) from conf-1000063 into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/909
 2024-12-17 13:38:22 +08:00
Robin 708d110069 Merge branch 'feat-IRONFANS-1000063-Robin' into conf-1000063 2024-12-17 13:38:06 +08:00
Robin 50e3e76698 by Robin at 20241217 2024-12-17 13:36:31 +08:00
Robin fefe5068ad by Robin at 20241217 2024-12-17 13:32:48 +08:00
wangxinyu d6b6541c15 Merge branch 'feature-wxid_filtration-wxy-20241209' into test 2024-12-16 17:49:12 +08:00
wangxinyu d738c8c840 fix:申请入驻接口增加微信昵称审核 2024-12-16 17:48:44 +08:00
Robin a6428df723 Merge branch 'feat-IRONFANS-212-Robin' into test 2024-12-16 17:47:12 +08:00
Robin 05dde6d4f2 by Robin at 20241216 2024-12-16 17:46:29 +08:00
chenhao 8a1181469e Merge pull request 'by Robin at 20241216' (#906) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/906
 2024-12-16 17:39:12 +08:00
Robin f73b7711da by Robin at 20241216 2024-12-16 17:38:14 +08:00
wangxinyu bf623d2be4 test:退款功能测试修改 2024-12-16 17:01:53 +08:00
chenhao 547600aad1 Merge pull request 'by Robin at 20241216' (#905) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/905
 2024-12-16 15:38:13 +08:00
Robin a5db8148b7 by Robin at 20241216 2024-12-16 15:37:44 +08:00
Robin 55a18a8157 Merge branch 'test' of http://121.41.31.146:3000/wishpal_ironfan/service into test 2024-12-16 14:57:11 +08:00
Robin 91bd63d2dd by Robin at 20241216 2024-12-16 14:57:09 +08:00
chenhao 9162ee4ab6 Merge pull request 'feat-IRONFANS-212-Robin' (#904) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/904
 2024-12-16 14:29:18 +08:00
Robin 7233ef223e by Robin at 20241216 2024-12-16 14:28:49 +08:00
Robin 7ec5798e11 by Robin at 20241216 2024-12-16 14:10:16 +08:00
Robin e19c44385d Merge branch 'feat-IRONFANS-1000063-Robin' into conf-1000063 2024-12-16 13:37:27 +08:00
Robin 131bc242c1 by Robin at 20241216 2024-12-16 13:35:55 +08:00
chenhao 7968e0df10 Merge pull request 'by Robin at 20241213' (#898) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/898
 2024-12-13 18:54:20 +08:00
Robin 87da42d38f by Robin at 20241213 2024-12-13 18:54:09 +08:00
chenhao e382ab6754 Merge pull request 'by Robin at 20241213' (#897) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/897
 2024-12-13 18:38:47 +08:00
Robin 775595eeb7 by Robin at 20241213 2024-12-13 18:38:30 +08:00
chenhao 51a8a4db1c Merge pull request 'by Robin at 20241213' (#896) from feat-IRONFANS-250-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/896
 2024-12-13 18:36:40 +08:00
Robin 5d64ee48e9 by Robin at 20241213 2024-12-13 18:36:29 +08:00
chenhao 7be15f04d8 Merge pull request 'by Robin at 20241213' (#895) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/895
 2024-12-13 18:26:14 +08:00
Robin 43a75bbf98 by Robin at 20241213 2024-12-13 18:25:56 +08:00
chenhao a6704d9f1e Merge pull request '1' (#894) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/894
 2024-12-13 17:51:52 +08:00
Robin f211d50df6 1 2024-12-13 17:50:31 +08:00
chenhao fab9becfb2 Merge pull request 'by Robin at 20241213' (#893) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/893
 2024-12-13 17:24:24 +08:00
Robin 29a5827ee5 by Robin at 20241213 2024-12-13 17:23:28 +08:00
chenhao a985a5717d Merge pull request 'feat-IRONFANS-212-Robin' (#892) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/892
 2024-12-13 17:22:00 +08:00
Robin 3bab569aa5 by Robin at 20241213 2024-12-13 17:20:26 +08:00
chenhao 90c2161e56 Merge pull request 'by Robin at 20241213' (#891) from feat-IRONFANS-250-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/891
 2024-12-13 15:54:52 +08:00
Robin 65d1dfa03e by Robin at 20241213 2024-12-13 15:54:27 +08:00
chenhao e1b7229895 Merge pull request 'by Robin at 20241213' (#890) from feat-IRONFANS-250-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/890
 2024-12-13 15:45:51 +08:00
Robin b509ee7de5 by Robin at 20241213 2024-12-13 15:45:31 +08:00
chenhao af9696285e Merge pull request 'feat-IRONFANS-250-Robin' (#889) from feat-IRONFANS-250-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/889
 2024-12-13 15:27:32 +08:00
Robin 71b4e56b07 by Robin at 20241213 2024-12-13 15:26:24 +08:00
Robin efaefd15a7 by Robin at 20241212 2024-12-13 15:16:31 +08:00
Robin 2a42b0c38a by Robin at 20241212 2024-12-12 17:46:16 +08:00
Robin cf680f293d by Robin at 20241212 2024-12-12 16:57:34 +08:00
Robin 42683cc4a0 Merge branch 'feat-IRONFANS-250-Robin' into conf-250 2024-12-12 16:40:06 +08:00
Robin 52d96d568d by Robin at 20241212 2024-12-12 16:31:44 +08:00
lwl0608 671b53f8c7 Merge branch 'dev-lwl/share_redirect_urls' into test 2024-12-12 14:45:33 +08:00
lwl0608 8b6d6a1435 share_redirect_urls 2024-12-12 14:45:24 +08:00
Robin 248969082d Merge branch 'feat-IRONFANS-250-Robin' into conf-250 2024-12-12 14:30:23 +08:00
Robin 22d07db708 by Robin at 20241212 2024-12-12 14:22:53 +08:00
wangxinyu 5b2314bf42 Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-12 11:57:48 +08:00
wangxinyu baa10d86a2 fix: 主播修改昵称审核 名字展示 2024-12-12 11:57:20 +08:00
wangxinyu 99e38d1251 Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-12 11:33:10 +08:00
wangxinyu 4e002b9d44 fix: 主播修改昵称审核 mongodb newName 2024-12-12 11:32:45 +08:00
wangxinyu d338364cc1 Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-12 11:07:21 +08:00
wangxinyu c1be559678 fix: 主播修改昵称审核 mongodb UpdateOne 2024-12-12 11:06:59 +08:00
wangxinyu 7ea1302274 Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-12 10:56:52 +08:00
wangxinyu 2ec8444167 fix: 主播修改昵称审核 mongodb UpsertOne 2024-12-12 10:56:28 +08:00
chenhao e97e4b3e74 Merge pull request 'feat-IRONFANS-212-Robin' (#883) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/883
 2024-12-11 18:23:53 +08:00
Robin 095d4ed5fb 1 2024-12-11 18:23:35 +08:00
wangxinyu 8df13426a6 Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-11 18:23:03 +08:00
wangxinyu 83cd231f76 fix: 主播修改昵称审核 upsert 2024-12-11 18:22:19 +08:00
chenhao beccc8b22f Merge pull request 'main' (#881) from main into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/881
 2024-12-11 18:21:17 +08:00
Robin 2a6107c1b9 by Robin at 20241211 2024-12-11 18:20:47 +08:00
Robin afd4108967 by Robin at 20241211 2024-12-11 18:16:16 +08:00
wangxinyu fdba3a67dc Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-11 18:00:12 +08:00
wangxinyu 523b277364 test: 测试日志增加 2024-12-11 17:59:40 +08:00
wangxinyu 3dc691906a Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-11 17:34:05 +08:00
wangxinyu 0628cc53d3 fix: 主播修改昵称 自测 数据写入失败修改 2024-12-11 17:33:40 +08:00
wangxinyu 33355be51a fix:合并 2024-12-11 16:54:28 +08:00
wangxinyu 550f72f71a Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 
# Conflicts:
#	dbstruct/account.go
 2024-12-11 16:49:59 +08:00
wangxinyu 9c4394fb34 feat: 主播昵称过人审 2024-12-11 16:44:38 +08:00
Robin 7ffa6ba385 by Robin at 20241211 2024-12-11 15:01:24 +08:00
Leufolium 18b474ac5f by Robin at 20241210 2024-12-10 23:36:28 +08:00
lwl0608 5fd6bec4bc add val 2024-12-10 17:11:09 +08:00
wangxinyu bbf48de065 Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-10 17:05:38 +08:00
wangxinyu 38b6d24a55 Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-10 16:01:21 +08:00
wangxinyu 1aec8d6534 fix: del todo1 2024-12-10 15:59:15 +08:00
wangxinyu 1fb5625ec0 feat: 主播修改微信昵称通过人审 2024-12-10 15:56:36 +08:00
lwl0608 5e596f2aac bin 2024-12-10 14:51:01 +08:00
lwl0608 2b884bd3fb add multi online 2024-12-10 14:49:57 +08:00
Robin 1cee56614f Merge branch 'feat-IRONFANS-250-Robin' into conf-250 2024-12-10 14:44:45 +08:00
Robin c589e06a7b by Robin at 20241210 2024-12-10 14:39:12 +08:00
lwl0608 f97f18ac49 Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-10 14:08:30 +08:00
lwl0608 bacf62d5a9 send ding msg 2024-12-10 14:08:23 +08:00
lwl0608 e3cf856aa7 Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-10 13:34:25 +08:00
lwl0608 e0d8575b78 no sync 2024-12-10 13:34:16 +08:00
wangxinyu eea6d0e028 Merge branch 'feature-wxid_filtration-wxy-20241209' into test 2024-12-10 11:46:49 +08:00
wangxinyu ac659dbc6c feat: 主播微信号不能设置[wxid]开头的初始微信 api接口 2024-12-10 11:46:24 +08:00
lwl0608 4804f72e41 test 2024-12-10 11:42:17 +08:00
lwl0608 666d2a6dfd test 2024-12-10 11:39:16 +08:00
lwl0608 592dfc7aa9 xxx 2024-12-10 11:30:33 +08:00
wangxinyu d479e16329 Merge branch 'feature-wxid_filtration-wxy-20241209' into test 2024-12-10 11:29:24 +08:00
lwl0608 7990465239 f 2024-12-10 11:22:15 +08:00
lwl0608 6bb656ee34 test 2024-12-10 11:21:48 +08:00
lwl0608 02da0b206d Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-10 11:20:05 +08:00
lwl0608 ea5a11fa17 x 2024-12-10 11:19:42 +08:00
wangxinyu 91f5c64404 Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-10 10:34:50 +08:00
wangxinyu 17902f8c2d fix: 退款详情页增加用户昵称 2024-12-10 10:34:17 +08:00
lwl0608 ce3dbbd907 Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-09 17:19:47 +08:00
lwl0608 95a927c26f fix 2024-12-09 17:19:39 +08:00
lwl0608 29f3073520 Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-09 17:17:29 +08:00
lwl0608 e33b76ba66 fix xinyidaole 2024-12-09 17:17:13 +08:00
lwl0608 7098dd4120 fix 2024-12-09 17:14:42 +08:00
lwl0608 7e3874e752 Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-09 17:11:39 +08:00
lwl0608 2848425315 fix 2024-12-09 17:11:34 +08:00
lwl0608 3c60ebc417 Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-09 17:00:01 +08:00
lwl0608 2ade2cf3b4 fix 2024-12-09 16:59:58 +08:00
lwl0608 bb529375d8 merge 2024-12-09 16:44:34 +08:00
lwl0608 293dd70d67 Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-09 16:44:14 +08:00
lwl0608 3a873c13a3 add 2024-12-09 16:44:08 +08:00
lwl0608 b6085d518a Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-09 16:32:44 +08:00
lwl0608 724249bf6a cancel ws 2024-12-09 16:32:37 +08:00
lwl0608 e59615c963 merge 2024-12-09 16:28:10 +08:00
chenhao 67c3dfc8af Merge pull request 'by Robin at 20241209' (#875) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/875
 2024-12-09 16:26:11 +08:00
Robin 16b2d31fb5 by Robin at 20241209 2024-12-09 16:24:52 +08:00
lwl0608 87e344c636 Merge branch 'dev-lwl/withraw_sync_alipay' into test 
# Conflicts:
#	app/mix/dao/mongo.go
#	app/mix/dao/mongo_vas.go
#	dbstruct/vas_mongo.go
 2024-12-09 16:20:13 +08:00
wangxinyu d973389e98 feat: 主播微信号不能设置[wxid]开头的初始微信 2024-12-09 16:18:43 +08:00
lwl0608 00c4baba5f /withraw_sync_alipay 2024-12-09 16:08:19 +08:00
wangxinyu aeb26c06b7 Merge remote-tracking branch 'origin/test' into test 2024-12-09 15:12:01 +08:00
wangxinyu e365c3b1af Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-09 15:08:14 +08:00
wangxinyu 7ef275a85e fix: 分页 2024-12-09 15:01:37 +08:00
Robin 3ebc0b6204 Merge branch 'feat-IRONFANS-250-Robin' into conf-250 2024-12-09 14:48:40 +08:00
wangxinyu 86e6bb4281 Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-09 13:46:32 +08:00
wangxinyu 468b1cbea9 fix: 退款参数校验，非本人id 操作 2024-12-09 12:21:42 +08:00
wangxinyu 1d76ad43c4 Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-09 11:41:34 +08:00
wangxinyu 10af8eab2d fix: list 改成空数组，offset修改 2024-12-09 11:40:55 +08:00
wangxinyu 7f86bc7d9f Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-09 10:47:27 +08:00
wangxinyu 7a2969236f fix: consts 2024-12-09 10:46:42 +08:00
wangxinyu 4e4b603a43 fix: 参数校验和日志 2024-12-09 10:44:20 +08:00
wangxinyu 87c0ffc9bd Merge branch 'feature-refund_v2-wxy-20241204' into test 
# Conflicts:
#	app/mix/controller/zone_vas_api.go
 2024-12-06 18:17:49 +08:00
wangxinyu 6dc5cbd36a Merge remote-tracking branch 'origin/feature-refund_v2-wxy-20241204' into feature-refund_v2-wxy-20241204 2024-12-06 18:15:42 +08:00
wangxinyu 2a9379677b fix: 参数校验 2024-12-06 18:15:28 +08:00
Robin 289b4616ad by Robin at 20241206 2024-12-06 17:41:45 +08:00
wangxinyu 4b2a4d92c6 fix: b_mid 和 mid 逻辑 2024-12-06 16:48:47 +08:00
wangxinyu 944595752c Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-06 16:35:15 +08:00
wangxinyu bb26a6676b fix: xxl-job ctx不能删除 2024-12-06 16:34:40 +08:00
wangxinyu f65a4464e1 Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-06 16:28:08 +08:00
wangxinyu d90d746c6b fix: mid 2024-12-06 16:26:51 +08:00
Robin 30f874af1f by Robin at 20241206 2024-12-06 15:07:23 +08:00
Robin d73c4d5034 by Robin at 20241206 2024-12-06 13:16:00 +08:00
wangxinyu 19130f931d Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-06 12:34:54 +08:00
wangxinyu c56de2019c fix: refund_list 入参 Zid 改为 BMid 2024-12-06 12:34:30 +08:00
wangxinyu 174e5045af Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-06 10:58:30 +08:00
wangxinyu 5ee947622a feat:xxl-job 扫描主播审批超时的退款单 2024-12-06 10:58:02 +08:00
wangxinyu 6264ce5b17 Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-05 16:24:00 +08:00
wangxinyu e24b88cb3a fix: int64 2024-12-05 16:23:29 +08:00