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

286 Commits

Author SHA1 Message Date
Leufolium 8b3d7a96cb by Robin at 20240404 2024-04-04 21:25:13 +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 cd19d49538 by Robin at 20240403 2024-04-03 16:45:30 +08:00
Leufolium 6a043dbbb7 by Robin at 20240403 2024-04-03 06:19:11 +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 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 12549d2de5 by Robin at 20240329; alter moment audit procedure 2024-03-29 00:16:42 +08:00
Leufolium 113cf31495 Merge remote-tracking branch 'origin/main' into test 2024-03-28 12:12:05 +08:00
Leufolium b67808caca by Robin at 20240327 2024-03-27 19:34:16 +08:00
Leufolium f7472ea634 by Robin at 20240326 2024-03-26 12:31:00 +08:00
Leufolium 594987f8ac by Robin at 20240326; alter 2024-03-26 12:29:53 +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 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 fca64cbb67 refund coin order 2024-03-19 16:04:36 +08:00
Leufolium 3d09829521 1 2024-03-19 00:05:23 +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
chenhao 6518d37c1f Merge pull request 'feat-IRONFANS-66-Robin' (#188) from feat-IRONFANS-66-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/188
 2024-03-18 23:43:13 +08:00
Leufolium ec2bad2abf by 2024-03-18 23:36:53 +08:00
Leufolium 67e27e04db Merge branch 'BUG-20240316-0001-Robin' into conflict 2024-03-16 22:36:05 +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 b833ecdc9e refund 2024-03-13 20:35:18 +08:00
chenhao 4711e9e2e4 Merge pull request 'by Robin at 20240313; alter msg for permanent block' (#175) from feat-IRONFANS-66-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/175
 2024-03-13 16:32:42 +08:00
Leufolium 3d0dbb6ca2 by Robin at 20240313; alter msg for permanent block 2024-03-13 16:31:51 +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
Leufolium 960adc1455 Merge branch 'feat-IRONFANS-58-Robin' into conflict 2024-03-08 01:30:30 +08:00
Leufolium 7dec418bfa by Robin at 20240308 2024-03-08 00:42:42 +08:00
Leufolium a1a4820b2c by Robin at 20240307 alter streamer cancel text 2024-03-07 02:17:24 +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 b728ab5e48 by Robin at 20240229; fix 2024-02-29 11:20:25 +08:00
Leufolium b2c8a76e37 by Robin at 20240229; add robot 2024-02-29 09:55:56 +08:00
chenhao 4903267633 Merge pull request 'feat-20240117-001-Robin' (#137) from feat-20240117-001-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/137
 2024-02-27 00:55:59 +08:00
lwl0608 48d058610d add wxpayh5 2024-02-26 19:28:03 +08:00
Leufolium f3f3c7633e by Robin at 20240223 2024-02-23 20:48:51 +08:00
Leufolium 86be2a9a84 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-22 22:31:20 +08:00
Leufolium cd07846804 by Robin at 20240222; fix 2024-02-22 21:50:34 +08:00
Leufolium 7e967887d9 by Robin at 20240222; add mobile phone get 2024-02-22 15:20:26 +08:00
Leufolium 19de07fbe4 by Robin at 20240221; change moment audit logic 2024-02-21 18:04:01 +08:00
lwl0608 98ea808079 add wechat auth code 2024-02-20 23:13:17 +08:00
lwl0608 201e1f4c5c wx jsapi 2024-02-20 23:05:24 +08:00
Leufolium cffaa2c880 by Robin at 20240207; fix error 2024-02-07 14:39:18 +08:00
Leufolium a1bb6f4a01 by Robin at 20240207 2024-02-07 14:06:05 +08:00
Leufolium 5079d25bb3 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-07 13:51:00 +08:00
Leufolium 12870ef2fd by Robin at 20240207; add aligned 2024-02-07 12:07:28 +08:00
lwl0608 ccf4417659 Merge branch 'dev-lwl/wechat' 2024-02-05 23:25:47 +08:00
Leufolium 96d6c8e703 by Robin at 20240205; content 2024-02-05 22:12:47 +08:00
chenhao 2be2b3f4a7 revert 21c4f6f18d 
revert by Robin at 20240205; content
 2024-02-05 22:11:49 +08:00
Leufolium 21c4f6f18d by Robin at 20240205; content 2024-02-05 22:11:00 +08:00
lwl0608 2793229b6c fix 2024-02-05 22:06: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
Leufolium 01092097c8 by Robin at 20240205 2024-02-05 21:18:27 +08:00
lwl0608 2261c021fa add config 2024-02-05 21:16:49 +08:00
chenhao 4346b953d6 Merge pull request 'feat-IRONFANS-46-20240201-Robin' (#92) from feat-IRONFANS-46-20240201-Robin into main 
Reviewed-on: #92
 2024-02-04 17:01:34 +08:00
lwl0608 332bcc87fc wx 2024-02-03 17:58:40 +08:00
lwl0608 d4011adb92 deal_one_order 2024-02-03 17:23:08 +08:00
Leufolium b3809eddf5 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-01 20:10:02 +08:00
Leufolium 110043116d by Robin at 20240201; add moment audit 2024-02-01 20:06:43 +08:00
Leufolium 2a60148d49 by Robin at 20240201; 2024-02-01 11:07:38 +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 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
Leufolium 9c42b763d8 by Robin at 20240122 2024-01-22 17:15:59 +08:00
Leufolium 851e62264f by Robin at 20240122; fix 2024-01-22 14:21:13 +08:00
lwl0608 e3abdff08c opt 2024-01-21 12:27:34 +08:00
Leufolium 9430918b7b by Robin at 20240120; fix 2024-01-20 18:48:38 +08:00
Leufolium a52ac4dfa7 by Robin at 20240120;l fix 2024-01-20 06:33:10 +08:00
Leufolium b14fd35846 by Robin at 20240119; fix 2024-01-19 17:56:17 +08:00
Leufolium 04b65a72d2 by Robin at 20240119; fix 2024-01-19 17:31:38 +08:00
Leufolium 876ec6513f By Robin at 20240119; fix 2024-01-19 00:31:03 +08:00
lwl0608 c6085f42d6 op order_list 2024-01-17 21:57:45 +08:00
Leufolium c5f5eb661c by Robin at 20240117; fix 2024-01-17 19:18:23 +08:00
Leufolium 26c55749a0 by Robin at 20240113; moment 2024-01-13 00:32:19 +08:00
Leufolium 1f6a083f93 by Robin at 20240110; login add inviter field 2024-01-10 23:19:34 +08:00
lwl0608 9ee9789d03 msg 2024-01-08 22:42:10 +08:00
lwl0608 ca0ed7bec9 apply time 2024-01-08 22:38:18 +08:00
lwl0608 537ed90d65 withdraw apply 2024-01-08 11:49:16 +08:00
lwl0608 4c6125177b add 2024-01-07 23:02:25 +08:00
lwl0608 9f2b80566e add 2024-01-07 22:37:06 +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
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
Leufolium 073ebfe814 by Robin at 20240102 2024-01-02 17:49:41 +08:00
Leufolium 5945014c7e by Robin at 20231231; fix not enabled info 2023-12-31 13:44:04 +08:00
Leufolium c11180094e by Robin at 20231231;fix single query 2023-12-31 13:41:46 +08:00
Leufolium 2be5fc87a3 Merge remote-tracking branch 'origin/main' into feat-20231230-001-Robin 2023-12-30 19:48:43 +08:00
chenhao 7eb88bdded Merge pull request 'feat-20231228-003-Robin' (#23) from feat-20231228-003-Robin into main 
Reviewed-on: #23
 2023-12-30 19:44:21 +08:00
Leufolium b0d29a76db by Robin at 20231230; fix 2023-12-30 19:28:50 +08:00
Leufolium ed3bc2294c by Robin at 20231230; add status 2023-12-30 17:32:41 +08:00
lwl0608 6d4c1eb05a 优化 1 2023-12-30 13:49:05 +08:00
Leufolium 2e638c4f04 by Robin at 20231229; media fill 2023-12-29 22:22:25 +08:00
lwl0608 5d8fda536a add check 2023-12-29 21:30:59 +08:00
lwl0608 1277bbafc9 fix 2023-12-29 20:47:34 +08:00
Leufolium e6f02150d6 fix 2023-12-29 18:48:37 +08:00
Leufolium 8d97788756 by Robin at 20231229; fix consts 2023-12-29 18:21:37 +08:00
chenhao 64f506cab4 Merge pull request 'by Robin at 20231229; fix' (#17) from feat-20231228-004-Robin into main 
Reviewed-on: #17
 2023-12-29 14:47:30 +08:00
Leufolium 881316a60a by Robin at 20231229; fix 2023-12-29 14:22:26 +08:00
lwl0608 7d5758d999 alipay callback 2023-12-29 14:16:37 +08:00
Leufolium d9a43a3c47 by Robin at 20231228; fix 2023-12-28 18:37:39 +08:00
Leufolium ac3b6c54b1 by Robin at 20231228; fix 2023-12-28 18:20:53 +08:00
Leufolium 8e32e5ac4a by Robin at 20231227; fix 2023-12-27 18:29:49 +08:00
Leufolium 476f711921 by Robin at 20231225; task service fail 2023-12-25 11:21:53 +08:00
Leufolium d70664c98b by Robin at 20231225; approval text 2023-12-25 10:36:48 +08:00
Leufolium 3669f868de Merge branch 'main' of http://121.196.202.62:3000/wishpal_ironfan/service 2023-12-24 13:35:01 +08:00
Leufolium 4faacbd342 by Robin at 20231224; userId 2023-12-24 13:34:25 +08:00
lwl0608 9db01451e2 add 2023-12-24 11:59:24 +08:00
Leufolium 87cf6ecb49 by Robin at 20231224; inviter 2023-12-24 02:02:20 +08:00
Leufolium 338ace4d30 by Robin at 20231223; op list by session 2023-12-23 22:45:59 +08:00
Leufolium dc71ebc274 by Robin at 20231223; list 2023-12-23 22:19:16 +08:00
Leufolium 4d560e5637 Merge branch 'main' of http://121.196.202.62:3000/wishpal_ironfan/service 2023-12-23 22:03:57 +08:00
Leufolium 7ea7b36776 by Robin at 20231223; contact session 2023-12-23 22:03:53 +08:00
lwl0608 157eed2d28 tmp 2023-12-23 19:34:02 +08:00
lwl0608 9f62b24fff fix gold_num 2023-12-23 17:09:07 +08:00
lwl0608 9a00286db6 service 2023-12-21 22:17:40 +08:00