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

772 Commits

Author SHA1 Message Date
chenhao 0645f170b4 Merge pull request 'by Robin at 20241210' (#879) from feat-IRONFANS-250-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/879
 2024-12-10 15:05:31 +08:00
Robin 4d92cc78ce by Robin at 20241210 2024-12-10 15:03:57 +08:00
chenhao 09d57f3600 Merge pull request 'by Robin at 20241210' (#878) from feat-IRONFANS-250-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/878
 2024-12-10 14:57:46 +08:00
Robin d74d36ed03 by Robin at 20241210 2024-12-10 14:56:33 +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
wangxinyu d479e16329 Merge branch 'feature-wxid_filtration-wxy-20241209' into test 2024-12-10 11:29:24 +08:00
wangxinyu 12b1052a9e Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-10 11:23:49 +08:00
wangxinyu 64977d4e2e fix: refundInfo参数 2024-12-10 11:23:22 +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 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
wangxinyu d973389e98 feat: 主播微信号不能设置[wxid]开头的初始微信 2024-12-09 16:18:43 +08:00
chenhao 2f71646c6d Merge pull request 'by Robin at 20241209' (#874) from feat-IRONFANS-250-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/874
 2024-12-09 14:53:27 +08:00
Robin 10abcad30f by Robin at 20241209 2024-12-09 14:52:49 +08:00
Robin 3ebc0b6204 Merge branch 'feat-IRONFANS-250-Robin' into conf-250 2024-12-09 14:48:40 +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 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 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
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 7cd2ac2d83 Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-05 15:54:58 +08:00
wangxinyu b9bbb70b96 fix: 接口参数 
feat: 审核校验
 2024-12-05 15:54:24 +08:00
wangxinyu fc0d077050 Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-05 15:06:02 +08:00
wangxinyu d0d17a6570 fix: 接口 debug 错误修改 1 2024-12-05 15:05:06 +08:00
wangxinyu f5d8e04dca Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-05 14:45:51 +08:00
wangxinyu 1e974bc7e5 fix: 接口 debug 错误修改 1 2024-12-05 14:44:39 +08:00
wangxinyu 250e1f72cb Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-05 13:53:05 +08:00
wangxinyu a939417d72 fix: mongo _id update 2 2024-12-05 13:51:40 +08:00
wangxinyu 921c97f895 Merge branch 'feature-refund_v2-wxy-20241204' into test 
# Conflicts:
#	app/mix/dao/mongo.go
#	app/mix/dao/mongo_vas.go
#	dbstruct/vas_mongo.go
 2024-12-05 12:58:06 +08:00
wangxinyu 05021a4bbb feat:用户退款，主播审核列表、详情、审批接口；用户退款接口修改 2024-12-05 11:51:59 +08:00
chenhao b9de1a1f58 Merge pull request 'by Robin at 20241204' (#869) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/869
 2024-12-04 16:56:16 +08:00
Robin b9f7164a33 by Robin at 20241204 2024-12-04 16:55:33 +08:00
Robin 0baf2e070f Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-12-04 16:02:36 +08:00
Robin 3d34992b20 by Robin at 20241204 2024-12-04 16:00:52 +08:00
chenhao 3b4254f521 Merge pull request 'by Robin at 20241203' (#860) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/860
 2024-12-03 15:42:11 +08:00
Robin 9a8483c295 by Robin at 20241203 2024-12-03 15:41:29 +08:00
Robin d3a93f0fbc Merge branch 'feat-IRONFANS-212-Robin' into test 2024-12-03 14:53:14 +08:00
Robin 495980a255 by Robin at 20241203 2024-12-03 14:52:07 +08:00
Robin 8a623283c2 Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-12-03 14:05:22 +08:00
Robin 89e840ec75 by Robin at 20241203 2024-12-03 14:00:36 +08:00
chenhao 29a707399c Merge pull request 'by Robin at 20241202' (#853) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/853
 2024-12-02 16:13:09 +08:00
Robin 376e151d32 by Robin at 20241202 2024-12-02 16:12:06 +08:00
Robin 8d1229aa79 Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-12-02 16:02:53 +08:00
Robin b408f1ff16 by Robin at 20241129 2024-11-29 17:30:12 +08:00
Robin 93bdb89080 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-212-Robin 2024-11-29 14:38:30 +08:00
lwl0608 99eba56134 Merge branch 'dev-lwl/firenze' 2024-11-29 14:38:25 +08:00
lwl0608 dfefd751af Merge branch 'dev-lwl/firenze' into test 2024-11-29 14:38:15 +08:00
lwl0608 7d0b3d7d6d online mids 2024-11-29 14:37:44 +08:00
Robin 3c47ac0f24 Merge branch 'feat-IRONFANS-212-Robin-Rebase2' into feat-IRONFANS-212-Robin 2024-11-29 14:26:56 +08:00
lwl0608 cf644494b0 Merge branch 'dev-lwl/firenze' 2024-11-29 14:23:16 +08:00
lwl0608 a32058bca6 Merge branch 'dev-lwl/firenze' into test 2024-11-29 14:23:03 +08:00
lwl0608 5485b76a50 add batch 2024-11-29 14:22:55 +08:00
Robin 1ff5c87a88 Merge branch 'feat-IRONFANS-212-Robin-Rebase' into feat-IRONFANS-212-Robin-Rebase2 2024-11-28 16:26:37 +08:00
lwl0608 fddec0f0b2 Merge branch 'dev-lwl/firenze' 2024-11-28 16:23:12 +08:00
lwl0608 bdfde60379 Merge branch 'dev-lwl/firenze' into test 2024-11-28 16:22:59 +08:00
lwl0608 9452d41eff SendBroadcastMsg 2024-11-28 16:22:44 +08:00
Robin d46ccbf188 Merge branch 'feat-IRONFANS-212-Robin-Rebase' into test 2024-11-28 16:01:14 +08:00
Robin 6a39c8925f by Robin at 20241128 2024-11-28 15:27:40 +08:00
Robin 131f55d8bf Merge branch 'feat-IRONFANS-212-Robin-Rebase' into conf-212 2024-11-27 16:25:19 +08:00
Robin ecb2a418c2 by Robin at 20241127 2024-11-27 15:36:49 +08:00
Robin 7be56f9775 by Robin at 20241127 2024-11-27 15:31:48 +08:00
chenhao 90b1d6e0aa Merge pull request 'by Robin at 20241127' (#846) from feat-IRONFANS-212-Robin-Rebase into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/846
 2024-11-27 13:24:30 +08:00
Robin f03238d753 by Robin at 20241127 2024-11-27 13:19:54 +08:00
Robin 7d82065430 Merge branch 'feat-IRONFANS-212-Robin-Rebase' into conf-212 2024-11-26 16:31:36 +08:00
Robin dd96ceb00c Merge branch 'feat-IRONFANS-248-Robin' into conf-248 2024-11-26 16:16:32 +08:00
Robin 056df14b1c by Robin at 20241126 2024-11-26 16:11:42 +08:00
chenhao 2c23e3e71c Merge pull request '1' (#838) from feat-IRONFANS-247-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/838
 2024-11-26 15:05:21 +08:00
Robin 9315eb8f18 1 2024-11-26 15:04:58 +08:00
Robin 340e6f400f by Robin at 20241126 2024-11-26 15:02:20 +08:00
Robin 5604e68412 Merge branch 'feat-IRONFANS-247-Robin' into test 2024-11-26 14:47:03 +08:00
Robin 3aed97c805 by Robin at 20241126 2024-11-26 14:44:35 +08:00
Robin cbb000da51 1 2024-11-26 14:21:40 +08:00
chenhao 329ebdae4f Merge pull request '1' (#834) from feat-IRONFANS-247-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/834
 2024-11-25 17:44:03 +08:00
Robin 1b10e71aa2 1 2024-11-25 17:42:51 +08:00
Robin de25330b3e 1 2024-11-25 17:40:43 +08:00
Robin 34759baafc Merge remote-tracking branch 'origin/main' into feat-IRONFANS-212-Robin 2024-11-25 17:12:59 +08:00
Robin 9e41c962e4 1 2024-11-25 17:10:27 +08:00
lwl0608 2e59c673b6 Merge branch 'dev-lwl/firenze' into test 2024-11-25 17:08:35 +08:00
lwl0608 f4380e6b52 firenze 2024-11-25 17:08:00 +08:00
Robin fa73de861f Merge branch 'feat-IRONFANS-247-Robin' into conf-247 2024-11-25 15:25:44 +08:00
Robin e87795abd8 1 2024-11-25 15:25:00 +08:00
Robin fd0142a96a Merge branch 'feat-IRONFANS-247-Robin' into conf-247 2024-11-25 15:24:18 +08:00
Robin 7957ee977b 1 2024-11-25 15:17:44 +08:00
Robin 10c733b972 by Robin at 20241125; guild registration 2024-11-25 15:15:29 +08:00
chenhao 7677ebe0dd Merge pull request 'BUG-20241119' (#818) from BUG-20241119 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/818
 2024-11-21 14:48:14 +08:00
Robin 660d636141 1 2024-11-21 14:47:44 +08:00
chenhao e72f9f9614 Merge pull request 'by Robin at 20241121' (#817) from BUG-20241119 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/817
 2024-11-21 14:17:10 +08:00
Leufolium 1ac849645c by Robin at 20241121 2024-11-21 14:15:55 +08:00
chenhao d4f38b5d34 Merge pull request 'by Robin at 20241120' (#816) from BUG-20241119 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/816
 2024-11-20 18:38:01 +08:00
Leufolium 76fe6ef75e by Robin at 20241120 2024-11-20 18:36:35 +08:00