Commit Graph

420 Commits

Author SHA1 Message Date
wangxinyu 16d4cd46a5 Merge remote-tracking branch 'origin/feature-refund_v2-wxy-20241204' into test 2024-12-23 16:58:38 +08:00
wangxinyu b7052cf399 fix: 退款-主播 id 修改 2024-12-23 16:58:05 +08:00
Robin 5c0228b186 Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-12-23 16:42:51 +08:00
Robin 7d6c85ad92 by Robin at 20241223 2024-12-23 16:40:11 +08:00
chenhao f612462c68 Merge pull request 'feat-IRONFANS-212-Robin' (#919) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/919
2024-12-19 15:07:27 +08:00
Robin a81ab39cf8 by Robin at 20241219 2024-12-19 15:00:10 +08:00
chenhao 75cf70878a Merge pull request 'by Robin at 20241218' (#917) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/917
2024-12-18 15:56:11 +08:00
Robin a194bc0229 by Robin at 20241218 2024-12-18 15:55:11 +08:00
wangxinyu 7b47d92bf0 Merge remote-tracking branch 'origin/feature-pay_picture-wxy-20241216' into test
# Conflicts:
#	dbstruct/account.go
2024-12-18 13:35:22 +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
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
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
wangxinyu 5a3ebbbb7c feat: 会员看原图 2024-12-13 17:42:12 +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
lwl0608 8183e4282c test 2024-12-13 12:08:49 +08:00
Robin 2a42b0c38a by Robin at 20241212 2024-12-12 17:46:16 +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 e5360d482e Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-12 11:39:40 +08:00
wangxinyu f695b1132d fix: 主播修改昵称审核 mongodb newName 2024-12-12 11:39:16 +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
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 afd4108967 by Robin at 20241211 2024-12-11 18:16:16 +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 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
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
wangxinyu d479e16329 Merge branch 'feature-wxid_filtration-wxy-20241209' into test 2024-12-10 11:29:24 +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
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
Robin 3ebc0b6204 Merge branch 'feat-IRONFANS-250-Robin' into conf-250 2024-12-09 14:48:40 +08:00
Robin 289b4616ad by Robin at 20241206 2024-12-06 17:41:45 +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