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

1722 Commits

Author SHA1 Message Date
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
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
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 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 7c396bccee Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-05 14:16:08 +08:00
wangxinyu 77ae5fac7e fix: controller req fix 2024-12-05 14:15:28 +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 96d2c62ae1 Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-05 13:22:13 +08:00
wangxinyu 6b06346550 fix: mongo _id update 2024-12-05 13:21:37 +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 cf2da7be16 del:del todo 2024-12-05 12:50:52 +08:00
wangxinyu 05021a4bbb feat:用户退款，主播审核列表、详情、审批接口；用户退款接口修改 2024-12-05 11:51:59 +08:00
lwl0608 0ee6c6e9cd Merge branch 'dev-lwl/xxxxfix' into test 2024-12-05 00:33:52 +08:00
lwl0608 330ffa3a47 fix url 2024-12-05 00:33:43 +08:00
chenhao 3f70ce7a3a Merge pull request 'by Robin at 20241204' (#871) from feat-IRONFANS-249-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/871
 2024-12-04 17:34:17 +08:00
Robin 3cdd0bc0b3 by Robin at 20241204 2024-12-04 17:33:54 +08:00
lwl0608 dc7463b22e fix 2024-12-04 17:08:38 +08:00
lwl0608 09b0701b50 add val 2024-12-04 17:07:30 +08:00
Robin 9970ba8b8e add log 2024-12-04 16:32:00 +08:00
Robin cede272891 by Robin at 20241204 2024-12-04 16:25:13 +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
lwl0608 7999575b91 Merge branch 'dev-lwl/opt_share' 2024-12-04 15:01:52 +08:00
chenhao 63f0788aaf Merge pull request 'by Robin at 20241204' (#866) from BUG-20241204 into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/866
 2024-12-04 13:25:50 +08:00
Robin 9ecbeb768a by Robin at 20241204 2024-12-04 13:25:17 +08:00
chenhao a4303fce09 Merge pull request 'by Robin at 20241204' (#864) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/864
 2024-12-04 13:03:04 +08:00
Robin dbf04e88d3 by Robin at 20241204 2024-12-04 13:02:01 +08:00
chenhao 2035a88965 Merge pull request 'by Robin at 20241203' (#863) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/863
 2024-12-03 17:27:05 +08:00
Robin 1c3f6940dc by Robin at 20241203 2024-12-03 17:25:40 +08:00
lwl0608 f20f7b2f8d vas 2024-12-03 16:57:44 +08:00
chenhao a08d31e59c Merge pull request 'feat-IRONFANS-212-Robin' (#862) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/862
 2024-12-03 16:50:34 +08:00
Robin 0c6545087b by Robin at 20241203 2024-12-03 16:49:57 +08:00
lwl0608 fd4d750f7a merge 2024-12-03 16:48:53 +08:00
Robin 06aa01e595 by Robin at 20241203 2024-12-03 16:19:27 +08:00
lwl0608 2a5678f5b0 mod 2024-12-03 15:57:41 +08:00
lwl0608 1464052697 zone_url 2024-12-03 15:54:46 +08:00
chenhao e4ba8891af Merge pull request 'by Robin at 20241203' (#861) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/861
 2024-12-03 15:51:59 +08:00
Robin d8dd440e76 by Robin at 20241203 2024-12-03 15:51:09 +08:00