wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,319 Commits 84 Branches 0 Tags 35 MiB
Commit Graph

301 Commits

Author SHA1 Message Date
Leufolium 8927d22bba by Robin at 20240408 2024-04-08 20:05:13 +08:00
Leufolium 5a333382ff Merge remote-tracking branch 'origin/feat-IRONFANS-70' into cf 2024-04-05 17:11:18 +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 be27160261 Merge remote-tracking branch 'origin/feat-IRONFANS-70' into conflict 2024-04-03 16:55:08 +08:00
Leufolium 1650066959 by Robin at 20240403 2024-04-03 06:28:55 +08:00
Leufolium ed5d905eb7 by Robin at 20240403 2024-04-03 06:04:50 +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
chenhao 266c9818f3 Merge pull request 'by Robin at 20240329' (#221) from feat-IRONFANS-76-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/221
 2024-03-29 23:08:24 +08:00
Leufolium cd7a9275aa by Robin at 20240329 2024-03-29 23:07:36 +08:00
chenhao 4066114141 Merge pull request 'by Robin at 20240329' (#220) from feat-IRONFANS-76-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/220
 2024-03-29 22:56:36 +08:00
Leufolium 8cc83fc70c by Robin at 20240329 2024-03-29 22:55:58 +08:00
Leufolium f435a98c08 Merge branch 'feat-IRONFANS-76-Robin' into conflict 2024-03-29 14:06:28 +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 315d467f30 by Robin at 20240328 2024-03-28 12:22:48 +08:00
Leufolium 113cf31495 Merge remote-tracking branch 'origin/main' into test 2024-03-28 12:12:05 +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 8dcd0562e4 by Robin at 20240326; alter streamer recomm 2024-03-26 18:11:38 +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
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 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
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 fca64cbb67 refund coin order 2024-03-19 16:04:36 +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 67e27e04db Merge branch 'BUG-20240316-0001-Robin' into conflict 2024-03-16 22:36:05 +08:00
Leufolium 89c8c5565b by Robin at 20240316; alter account search expr 2024-03-16 22:33:58 +08:00
Leufolium 1954e80ab3 Merge branch 'feat-IRONFANS-58-Robin' into conflict 2024-03-14 07:55:43 +08:00
Leufolium a2f70a63d9 by Robin at 20240314; add newly-created moment 2024-03-14 07:53:25 +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
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 f990dd0be0 Merge branch 'feat-IRONFANS-66-Robin' into conflict 2024-03-12 12:10:16 +08:00
Leufolium 81916b58bb by Robin at 20240312; apply 2024-03-12 12:06:45 +08:00
Leufolium 4cf49ad204 Merge branch 'feat-IRONFANS-58-Robin' into conflict 2024-03-08 21:21:20 +08:00
Leufolium 43138ec16d by Robin at 20240308; moment recomm 2024-03-08 21:14:40 +08:00
chenhao 2c7ffb40c9 Merge pull request 'by Robin at 20240308; add bottom flag' (#165) from feat-IRONFANS-58-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/165
 2024-03-08 15:15:49 +08:00
Leufolium bed1313e84 by Robin at 20240308; add bottom flag 2024-03-08 15:15:09 +08:00
chenhao 74c6061db0 Merge pull request 'by Robin at 20240308; logout' (#164) from feat-IRONFANS-62-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/164
 2024-03-08 12:52:59 +08:00
Leufolium f94f90b0e7 by Robin at 20240308; logout 2024-03-08 12:52:10 +08:00
Leufolium 960adc1455 Merge branch 'feat-IRONFANS-58-Robin' into conflict 2024-03-08 01:30:30 +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
chenhao 365b860df3 Merge pull request 'feat-IRONFANS-62-Robin' (#158) from feat-IRONFANS-62-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/158
 2024-03-07 01:46:51 +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
chenhao 20a97b8ba7 Merge pull request 'feat-IRONFANS-61-Robin' (#154) from feat-IRONFANS-61-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/154
 2024-02-29 11:23:45 +08:00
Leufolium b728ab5e48 by Robin at 20240229; fix 2024-02-29 11:20:25 +08:00
Leufolium 32c5541cdb Merge branch 'feat-IRONFANS-61-Robin' into conflict 2024-02-29 10:54:09 +08:00
Leufolium 0e297f564c by Robin at 20240229; fix 2024-02-29 10:34:21 +08:00
Leufolium b2c8a76e37 by Robin at 20240229; add robot 2024-02-29 09:55:56 +08:00
chenhao 71f7764e07 Merge pull request 'feat-IRONFANS-56-Robin' (#140) from feat-IRONFANS-56-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/140
 2024-02-27 01:51:28 +08:00
Leufolium 2decbe9c67 by Robin at 20240227; register source statistics 2024-02-27 01:50:47 +08:00
chenhao 828c3fbadd Merge pull request 'feat-20240117-001-Robin' (#135) from feat-20240117-001-Robin into test 
Reviewed-on: #135
 2024-02-26 08:27:01 +08:00
Leufolium 6fb4fe002e by Robin at 20240226; 2024-02-26 08:03:37 +08:00
chenhao 9051c79080 Merge pull request 'by Robin at 20240223' (#133) from feat-20240117-001-Robin into test 
Reviewed-on: #133
 2024-02-23 20:49:57 +08:00
Leufolium f3f3c7633e by Robin at 20240223 2024-02-23 20:48:51 +08:00
Leufolium baa6256491 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-22 22:50:41 +08:00
Leufolium 86be2a9a84 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-22 22:31:20 +08:00
Leufolium cadcb90538 by Robin at 20240222; fix 2024-02-22 22:29:21 +08:00
Leufolium cd07846804 by Robin at 20240222; fix 2024-02-22 21:50:34 +08:00
Leufolium 582cb27830 Merge branch 'feat-IRONFANS-54-Robin' into conflict 2024-02-22 14:39:53 +08:00
Leufolium 967d383b46 by Robin at 20240222; fix 2024-02-22 14:36:28 +08:00
lwl0608 6952c1fbce fix 2024-02-19 21:13:18 +08:00
lwl0608 c61abde23b fff 2024-02-18 23:47:58 +08:00
lwl0608 ef6538528d 支付宝优化 2024-02-18 23:24:52 +08:00
chenhao f7a823dfd6 Merge pull request 'fix query audit bug' (#121) from feat-20240117-001-Robin into test 
Reviewed-on: #121
 2024-02-07 14:44:21 +08:00
Leufolium d195f05661 fix query audit bug 2024-02-07 14:42:50 +08:00
chenhao cc576a5228 Merge pull request 'by Robin at 20240207;' (#111) from feat-20240117-001-Robin into test 
Reviewed-on: #111
 2024-02-07 12:24:34 +08:00
Leufolium 22c605022d by Robin at 20240207; 2024-02-07 12:23:27 +08:00
Leufolium b19f4eb26d Merge branch 'feat-20240117-001-Robin' into conflict-test-feat-20240117-001-Robin 2024-02-07 12:15:34 +08:00
Leufolium 12870ef2fd by Robin at 20240207; add aligned 2024-02-07 12:07:28 +08:00
Leufolium eeccbf6315 Merge branch 'feat-IRONFANS-53-20240205-Robin' into feat-20240117-001-Robin 2024-02-05 21:26:22 +08:00
chenhao 4627c9d2a0 Merge pull request 'feat-IRONFANS-53-20240205-Robin' (#102) from feat-IRONFANS-53-20240205-Robin into test 
Reviewed-on: #102
 2024-02-05 21:21:13 +08:00
Leufolium 01092097c8 by Robin at 20240205 2024-02-05 21:18:27 +08:00
Leufolium 2d405a4549 Merge branch 'feat-20240117-001-Robin' into conflict-test-feat-20240117-001 2024-02-02 07:42:29 +08:00
Leufolium b3809eddf5 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-01 20:10:02 +08:00
Leufolium a5b635b5be by Robin at 20240201; fix 2024-02-01 19:44:07 +08:00
Leufolium 4f80f4540b Merge branch 'feat-IRONFANS-46-20240201-Robin' into conflict-test-feat-IRONFANS-46 2024-02-01 10:52:52 +08:00
Leufolium 52279af4a9 by Robin at 20240201; 2024-02-01 10:19:44 +08:00
Leufolium c71c996afd by Robin at 20240201; 2024-02-01 09:52:45 +08:00
Leufolium f1ffbf473a by Robin at 20240201; 2024-02-01 09:02:11 +08:00
chenhao 2c0855ffb0 Merge pull request 'feat-20240121-001-Robin' (#74) from feat-20240121-001-Robin into test 
Reviewed-on: #74
 2024-01-23 19:39:31 +08:00
Leufolium e20f3c338c Merge branch 'feat-20240121-001-Robin' into conflict-feat-20240112-001-main 2024-01-23 18:01:39 +08:00
chenhao f724fed644 Merge pull request 'feat-20230112-001-Robin' (#67) from feat-20230112-001-Robin into main 
Reviewed-on: #67
 2024-01-23 17:56:14 +08:00
chenhao 75fc8d2611 Merge pull request 'feat-20240121-001-Robin' (#64) from feat-20240121-001-Robin into test 
Reviewed-on: #64
 2024-01-22 15:14:17 +08:00
Leufolium 851e62264f by Robin at 20240122; fix 2024-01-22 14:21:13 +08:00
lwl0608 f3a9c15507 coinorder 2024-01-21 12:45:20 +08:00
lwl0608 7f352fd00d keyword 2024-01-21 12:37:46 +08:00
lwl0608 e3abdff08c opt 2024-01-21 12:27:34 +08:00
chenhao 75873b7c44 Merge pull request 'feat-20240119-001-Robin' (#61) from feat-20240119-001-Robin into test 
Reviewed-on: #61
 2024-01-19 17:56:39 +08:00
Leufolium 04b65a72d2 by Robin at 20240119; fix 2024-01-19 17:31:38 +08:00
lwl0608 c6085f42d6 op order_list 2024-01-17 21:57:45 +08:00
chenhao 8958e679f1 Merge pull request 'feat-20230112-001-Robin' (#57) from feat-20230112-001-Robin into test 
Reviewed-on: #57
 2024-01-13 00:32:56 +08:00
Leufolium 26c55749a0 by Robin at 20240113; moment 2024-01-13 00:32:19 +08:00
chenhao b4edbef3b9 Merge pull request 'feat-20240109-001-Robin' (#48) from feat-20240109-001-Robin into test 
Reviewed-on: #48
 2024-01-10 00:20:14 +08:00
lwl0608 ca0ed7bec9 apply time 2024-01-08 22:38:18 +08:00
lwl0608 447ba67460 修复 bug 2024-01-08 21:24:45 +08:00
lwl0608 e83ef6f0ed args fix 2024-01-08 12:51:45 +08:00
lwl0608 0973f04892 agrs cnt 2024-01-08 12:49:24 +08:00
lwl0608 7a55c52f0d add 2024-01-08 12:40:27 +08:00
lwl0608 537ed90d65 withdraw apply 2024-01-08 11:49:16 +08:00
chenhao 1edf374213 Merge pull request 'feat-20230104-001-Robin' (#47) from feat-20230104-001-Robin into main 
Reviewed-on: #47
 2024-01-05 00:24:32 +08:00
chenhao 505d617b9f Merge pull request 'feat-20230104-001-Robin' (#44) from feat-20230104-001-Robin into test 
Reviewed-on: #44
 2024-01-04 21:56:14 +08:00
Leufolium 710f5f01a3 by Robin at 20240104; fix 2024-01-04 21:55:00 +08:00
lwl0608 ac91201240 add 2024-01-04 18:10:26 +08:00
chenhao bb8a2acd6a Merge pull request 'feat-20230102-001-Robin' (#41) from feat-20230102-001-Robin into main 
Reviewed-on: #41
 2024-01-04 13:09:50 +08:00
chenhao eaed3195e6 Merge pull request 'feat-20230102-001-Robin' (#37) from feat-20230102-001-Robin into test 
Reviewed-on: #37
 2024-01-03 16:19:38 +08:00
Leufolium 3cc042ba66 by Robin at 20230103; add daily statement 2024-01-03 16:16:41 +08:00
chenhao b1b4fed922 Merge pull request 'feat-20231228-001-Robin' (#36) from feat-20231228-001-Robin into main 
Reviewed-on: #36
 2024-01-02 22:41:44 +08:00
Leufolium db6670572e by Robin at 20230102; account count 2024-01-02 19:34:05 +08:00
chenhao e5d6e1adbb Merge pull request 'fix-20230102-BUG0001-Robin' (#32) from fix-20230102-BUG0001-Robin into test 
Reviewed-on: #32
 2024-01-02 15:57:08 +08:00
lwl0608 a4e9c589a3 优化 2024-01-01 12:19:48 +08:00
chenhao c58fe1debc Merge pull request 'feat-20231230-001-Robin' (#25) from feat-20231230-001-Robin into test 
Reviewed-on: #25
 2023-12-30 19:49:54 +08:00
Leufolium b0d29a76db by Robin at 20231230; fix 2023-12-30 19:28:50 +08:00
chenhao 60f6b50381 Merge pull request 'by Robin at 20231230; add status' (#21) from feat-20231228-001-Robin into test 
Reviewed-on: #21
 2023-12-30 17:33:19 +08:00
Leufolium ed3bc2294c by Robin at 20231230; add status 2023-12-30 17:32:41 +08:00
lwl0608 6b73807a4e fix 2023-12-30 14:52:53 +08:00
lwl0608 8660fcf986 fix 2023-12-30 14:42:40 +08:00
lwl0608 7d5758d999 alipay callback 2023-12-29 14:16:37 +08:00
chenhao 1ce724a2c6 Merge pull request 'feat-20231228-001-Robin' (#13) from feat-20231228-001-Robin into test 
Reviewed-on: #13
 2023-12-28 18:24:26 +08:00
Leufolium ac3b6c54b1 by Robin at 20231228; fix 2023-12-28 18:20:53 +08:00
chenhao f6137a8299 Merge pull request 'by Robin at 20231227; fix' (#12) from feat-20231227-002-Robin into main 
Reviewed-on: #12
 2023-12-28 17:43:40 +08:00
chenhao 6729b8180f Merge pull request 'by Robin at 20231227; fix' (#8) from feat-20231227-002-Robin into test 
Reviewed-on: #8
 2023-12-27 18:30:30 +08:00
Leufolium 8e32e5ac4a by Robin at 20231227; fix 2023-12-27 18:29:49 +08:00
chenhao fa94f04873 Merge pull request 'fix-20231226-Robin-BUG0001' (#7) from fix-20231226-Robin-BUG0001 into test 
Reviewed-on: #7
 2023-12-26 22:07:03 +08:00
Leufolium e4ee8542ea by Robin at 20231226 2023-12-26 22:03:48 +08:00
Leufolium 837f12c614 test 2023-12-25 16:14:17 +08:00
lwl0608 eaf9974b55 mysql ping 2023-12-25 01:02:06 +08:00
lwl0608 e21f302b28 add 2023-12-24 00:02:22 +08:00
Leufolium 338ace4d30 by Robin at 20231223; op list by session 2023-12-23 22:45:59 +08:00
Leufolium 7ea7b36776 by Robin at 20231223; contact session 2023-12-23 22:03:53 +08:00
lwl0608 9a00286db6 service 2023-12-21 22:17:40 +08:00