Commit Graph

449 Commits

Author SHA1 Message Date
chenhao 9436053275 Merge pull request 'by Robin at 20240418' (#300) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/300
2024-04-18 05:59:58 +08:00
Leufolium 4fc3732b94 by Robin at 20240418 2024-04-18 05:59:11 +08:00
chenhao 4911ff6add Merge pull request 'by Robin at 20240417' (#298) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/298
2024-04-17 23:40:11 +08:00
Leufolium 13fb262b82 by Robin at 20240417 2024-04-17 23:39:37 +08:00
lwl0608 f5e7265d23 fix checkwlt 2024-04-16 22:14:40 +08:00
lwl0608 d731659a50 fix 2024-04-16 22:09:15 +08:00
lwl0608 89bc85b415 fix 2024-04-16 21:57:34 +08:00
lwl0608 e03489feba fix 2024-04-16 21:54:31 +08:00
lwl0608 c3247fcf66 fix checkwallet 2024-04-16 21:49:18 +08:00
lwl0608 03fdc98f3d 修复 2024-04-16 21:13:26 +08:00
lwl0608 5dedd4fd27 fix db 2024-04-16 20:20:53 +08:00
chenhao 559f6c1aff Merge pull request 'by Robin at 20240416' (#296) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/296
2024-04-16 19:48:29 +08:00
Leufolium 50ef95271c by Robin at 20240416 2024-04-16 19:48:15 +08:00
lwl0608 2177fdadbb zv fix 2024-04-16 19:39:51 +08:00
lwl0608 a3555962d8 fix 2024-04-16 19:19:06 +08:00
Leufolium 7b24d98dd5 By Robin at 20240416 2024-04-16 19:01:33 +08:00
Leufolium 4fe9faa1bb by Robin at 20240416 2024-04-16 18:59:32 +08:00
lwl0608 9fdbd5bcb2 add 2024-04-16 10:49:02 +08:00
lwl0608 5c01857d28 add 2024-04-16 09:51:39 +08:00
Leufolium da6d60020c by Robin at 20240416 2024-04-16 07:41:52 +08:00
lwl0608 eb3d14199e vas 2024-04-15 15:17:30 +08:00
chenhao c1a2237479 Merge pull request 'dev-feat-IRONFANS-70-Robin' (#286) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/286
2024-04-12 23:07:12 +08:00
Leufolium 0afe2c2193 by Robin at 20240412 2024-04-12 23:05:46 +08:00
Leufolium e986f9ba07 by Robin at 20240412 2024-04-12 23:02:55 +08:00
lwl0608 91a3bd5371 add 2024-04-12 10:01:56 +08:00
Leufolium c7d931b10e by Robin at 20240411 2024-04-12 06:40:43 +08:00
Leufolium 52624ac592 by Robin at 20240411 2024-04-12 06:40:30 +08:00
Leufolium 8faf3cfefe by Robin at 20240411 2024-04-11 22:19:28 +08:00
Leufolium b4e04b8841 by Robin at 20240411 2024-04-11 21:51:46 +08:00
Leufolium 99116d4f31 by Robin at 20240411 2024-04-11 20:58:26 +08:00
Leufolium 159b16a8a7 by Robin at 20240411 2024-04-11 20:17:55 +08:00
Leufolium 6c47d7fa33 by Robin at 20240411 2024-04-11 19:37:04 +08:00
Leufolium c89082aea9 by Robin at 20240411 2024-04-11 19:34:51 +08:00
Leufolium acfe24623f by Robin at 20240411 2024-04-11 18:33:38 +08:00
Leufolium 50945229e6 by Robin at 20240411 2024-04-11 18:17:32 +08:00
Leufolium 31903d0ed0 by Robin at 20240411 2024-04-11 17:58:33 +08:00
Leufolium 0dd9eb1360 by Robin at 20240411 2024-04-11 16:52:30 +08:00
Leufolium 1c5a9bbdc5 by Robin at 20240411 2024-04-11 16:08:05 +08:00
Leufolium b7e5eda22d by Robin at 20240411 2024-04-11 15:55:14 +08:00
Leufolium 0975288b86 by Robin at 20240411 2024-04-11 15:46:01 +08:00
Leufolium 9e1ec21e31 b 2024-04-11 14:40:18 +08:00
Leufolium cc882c203d by Robin at 20240411 2024-04-11 14:37:45 +08:00
Leufolium 5b292b346a by Robin at 20240411 2024-04-11 14:03:40 +08:00
Leufolium ab65df6d06 by Robin at 20240411 2024-04-11 14:01:26 +08:00
Leufolium da1aa0ebd7 by Robin at 20240411 2024-04-11 00:25:06 +08:00
Leufolium 67949942be by Robin at 20240409 2024-04-09 22:37:12 +08:00
Leufolium f96a04614a by Robin at 20240409 2024-04-09 19:19:16 +08:00
Leufolium 8927d22bba by Robin at 20240408 2024-04-08 20:05:13 +08:00
Leufolium 3b56c2df7c by Robin at 20240405; 2024-04-05 19:23:36 +08:00
Leufolium 4bb95ee7c6 by Robin at 20240404 2024-04-04 21:22:19 +08:00
Leufolium 273f7a858c by Robin at 20240404 2024-04-04 21:17:05 +08:00
Leufolium 2400311048 by Robin at 20240404 2024-04-04 21:03:32 +08:00
Leufolium 4820bd9503 by Robin at 20240404 2024-04-04 20:48:42 +08:00
Leufolium 77b664bbea by Robin at 20240403 2024-04-03 21:53:46 +08:00
Leufolium 44d9325e54 by Robin at 20240403; 2024-04-03 06:34:28 +08:00
Leufolium 1650066959 by Robin at 20240403 2024-04-03 06:28:55 +08:00
Leufolium 6a043dbbb7 by Robin at 20240403 2024-04-03 06:19:11 +08:00
Leufolium ed5d905eb7 by Robin at 20240403 2024-04-03 06:04:50 +08:00
Leufolium 50f7e16608 by Robin at 20240403 2024-04-03 04:56:21 +08:00
Leufolium ea6eea1ccf by Robin at 20240403 2024-04-03 00:25:14 +08:00
Leufolium 15bb43afdf by Robin at 20240402 2024-04-02 22:47:41 +08:00
Leufolium a31e57c806 by Robin at 20240402 2024-04-02 18:53:26 +08:00
Leufolium a69bcdb6a2 Merge branch 'feat-IRONFANS-70' into dev-feat-IRONFANS-70-Robin 2024-04-01 11:19:10 +08:00
Leufolium dc65d4f32e Merge remote-tracking branch 'origin/main' into feat-IRONFANS-70 2024-04-01 11:18:03 +08:00
chenhao 77a336bfa8 Merge pull request 'feat-IRONFANS-76-Robin' (#222) from feat-IRONFANS-76-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/222
2024-03-29 23:19:33 +08:00
Leufolium cd7a9275aa by Robin at 20240329 2024-03-29 23:07:36 +08:00
Leufolium 8cc83fc70c by Robin at 20240329 2024-03-29 22:55:58 +08:00
Leufolium f08bd346c9 by Robin at 20240329 2024-03-29 14:03:59 +08:00
Leufolium 12549d2de5 by Robin at 20240329; alter moment audit procedure 2024-03-29 00:16:42 +08:00
chenhao 114939f340 Merge pull request 'by Robin at 20240328' (#217) from feat-IRONFANS-ALTER-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/217
2024-03-28 13:00:25 +08:00
Leufolium df9defb44f by Robin at 20240328 2024-03-28 13:00:07 +08:00
Leufolium 1bd0784227 by Robin at 20240327; 2024-03-27 20:50:40 +08:00
Leufolium fd1706dd51 by Robin at 20240327; op list deleted 2024-03-27 20:29:22 +08:00
Leufolium 3cc6f0a322 by Robin at 20240327; alter down 2024-03-27 15:45:01 +08:00
Leufolium 8dcd0562e4 by Robin at 20240326; alter streamer recomm 2024-03-26 18:11:38 +08:00
Leufolium dc3432ee72 by 2024-03-26 13:17:10 +08:00
Leufolium ed6b2e356b by Robin at 20240326 2024-03-26 13:12:15 +08:00
Leufolium 594987f8ac by Robin at 20240326; alter 2024-03-26 12:29:53 +08:00
chenhao bf2605738c Merge pull request 'by Robin at 20240325; fix bug' (#200) from BUG-20240322-0001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/200
2024-03-25 12:27:53 +08:00
Leufolium 7df6e1862c by Robin at 20240325; fix bug 2024-03-25 12:27:37 +08:00
Leufolium 1ab2b556a1 Merge branch 'BUG-20240322-0001-Robin' into mainconflict 2024-03-25 12:13:49 +08:00
Leufolium 294bea59e4 By Robin at 20240325; fix bug 2024-03-25 12:11:29 +08:00
chenhao a934f070d7 Merge pull request 'by Robin at 20240322; -fans' (#196) from feat-IRONFANS-58-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/196
2024-03-22 14:08:44 +08:00
Leufolium dacc31cb31 by Robin at 20240322; -fans 2024-03-22 14:08:30 +08:00
Leufolium 5344a54888 Merge remote-tracking branch 'origin/feat-IRONFANS-58-Robin' into mainconflict 2024-03-22 13:54:11 +08:00
Leufolium 407292fe8d by Robin at 20240321 2024-03-21 23:26:23 +08:00
lwl0608 bbcfcb3b95 fix recover 2024-03-21 20:31:12 +08:00
lwl0608 53086cde6c fix recover 2024-03-21 20:27:42 +08:00
lwl0608 ad95c1be67 recover 2024-03-21 20:18:22 +08:00
lwl0608 6f16b754ce fix panic 2024-03-21 20:10:30 +08:00
lwl0608 59d9638bef fix 2024-03-21 20:06:27 +08:00
lwl0608 1cd3e685e3 fix 退款理由 2024-03-21 20:03:31 +08:00
lwl0608 1255e0f916 fix 退款理由 2024-03-21 19:54:20 +08:00
lwl0608 f1728bb5a3 fix err return 2024-03-21 19:25:54 +08:00
lwl0608 27e50ded04 fix err return 2024-03-21 19:18:50 +08:00
lwl0608 66f90c6b45 op order list 2024-03-21 16:05:11 +08:00
lwl0608 6d73c70cf7 op order list 2024-03-21 16:02:41 +08:00
lwl0608 b263f04fd1 fix 2024-03-20 18:57:05 +08:00
lwl0608 2511bf9e1f 优化 2024-03-20 18:51:16 +08:00
Leufolium a364553c0c by Robin at 20240320 2024-03-20 10:06:26 +08:00
lwl0608 acd49e99a2 fix 2024-03-19 17:41:51 +08:00
lwl0608 9bd1c77f4a fix 2024-03-19 16:34:02 +08:00
lwl0608 31a7247337 优化 2024-03-19 16:21:53 +08:00
lwl0608 d2e0a24bb3 fix productid 2024-03-19 16:09:51 +08:00
lwl0608 fca64cbb67 refund coin order 2024-03-19 16:04:36 +08:00
lwl0608 05fbd7e04e 充值明细 优化 2024-03-19 10:30:25 +08:00
lwl0608 184a3ff5e2 明细 时间倒序 2024-03-19 10:20:50 +08:00
Leufolium 37c3929e9d Merge remote-tracking branch 'origin/feat-IRONFANS-62-Robin' into mainconflict 2024-03-19 00:01:43 +08:00
chenhao 6bda0929d9 Merge pull request 'feat-IRONFANS-66-Robin' (#189) from feat-IRONFANS-66-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/189
2024-03-18 23:51:52 +08:00
Leufolium d2f961a2d4 1 2024-03-18 23:51:31 +08:00
Leufolium 5ca57d639f ret 2024-03-17 00:32:47 +08:00
Leufolium 8c82c59384 1 2024-03-17 00:31:02 +08:00
Leufolium f2c294b379 1 2024-03-17 00:25:37 +08:00
Leufolium 89c8c5565b by Robin at 20240316; alter account search expr 2024-03-16 22:33:58 +08:00
Leufolium 5ccad2cbca by Robin at 20240315 2024-03-15 21:18:11 +08:00
Leufolium a10ce673ec by Robin at 20240315; alter upper bound 2024-03-15 21:13:57 +08:00
Leufolium b8dc1a7a1b Merge remote-tracking branch 'origin/testonly-vericode_create' into mainconflict 2024-03-15 00:45:38 +08:00
Leufolium a2f70a63d9 by Robin at 20240314; add newly-created moment 2024-03-14 07:53:25 +08:00
lwl0608 7b4954bbf8 fix streamer id 2024-03-13 21:06:00 +08:00
lwl0608 371cf04c5f ch log 2024-03-13 20:51:29 +08:00
lwl0608 9e1a95bfe3 refund 2024-03-13 20:38:03 +08:00
lwl0608 779e47996e Merge branch 'dev-lwl/refund' 2024-03-13 20:35:32 +08:00
lwl0608 b833ecdc9e refund 2024-03-13 20:35:18 +08:00
Leufolium 3d0dbb6ca2 by Robin at 20240313; alter msg for permanent block 2024-03-13 16:31:51 +08:00
chenhao 5881859273 Merge pull request 'by Robin at 20240222; fix' (#174) from feat-IRONFANS-54-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/174
2024-03-12 23:49:14 +08:00
Leufolium 81916b58bb by Robin at 20240312; apply 2024-03-12 12:06:45 +08:00
Leufolium d93e59e24f by Robin at 20240308; moment list by ids add follow 2024-03-08 23:03:20 +08:00
Leufolium 7497d4afe5 by Robin at 20240308; remove log 2024-03-08 22:46:49 +08:00
Leufolium db9d6b2b0b by Robin at 20240308 2024-03-08 22:36:16 +08:00
Leufolium 43138ec16d by Robin at 20240308; moment recomm 2024-03-08 21:14:40 +08:00
Leufolium 30bcd59226 by Robin at 20240308,up op refreshes bottom flag 2024-03-08 15:43:15 +08:00
Leufolium 5f253ab9d3 fix 2024-03-08 15:22:33 +08:00
Leufolium 81d0858aad by 2024-03-08 15:21:52 +08:00
Leufolium bed1313e84 by Robin at 20240308; add bottom flag 2024-03-08 15:15:09 +08:00
Leufolium f94f90b0e7 by Robin at 20240308; logout 2024-03-08 12:52:10 +08:00
Leufolium 5a965d4f75 by Robin at 20240308 2024-03-08 01:38:07 +08:00
Leufolium 23d64b3454 by Robin at 20240308 2024-03-08 01:25:43 +08:00
Leufolium 47ef06b88f by Robin at 20240308 2024-03-08 01:13:48 +08:00
Leufolium 9692680528 by 2024-03-08 00:59:20 +08:00
Leufolium 7dec418bfa by Robin at 20240308 2024-03-08 00:42:42 +08:00
lwl0608 3273330c76 refund 2024-03-07 19:39:33 +08:00
Leufolium 279263fd54 d 2024-03-07 01:49:37 +08:00
Leufolium 8dfbc2326b by Robin at 20240307 2024-03-07 01:43:30 +08:00
Leufolium 51d3e5e568 By Robin at 20240307 2024-03-07 01:18:41 +08:00
chenhao e95ca7f4f1 revert 5fab9ff0fd
revert By Robin at 20240304; cancel account function at mongo part
2024-03-05 13:21:22 +08:00
Leufolium 5fab9ff0fd By Robin at 20240304; cancel account function at mongo part 2024-03-04 19:21:30 +08:00
Leufolium b2b29d7466 by Robin at 20240302 2024-03-02 08:29:20 +08:00
Leufolium b41aad7e4e 1 2024-02-29 11:22:33 +08:00
Leufolium b728ab5e48 by Robin at 20240229; fix 2024-02-29 11:20:25 +08:00
Leufolium 9f924901ec by Robin at 20240229; fix 2024-02-29 10:49:54 +08:00