Commit Graph

116 Commits

Author SHA1 Message Date
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
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
lwl0608 614c93f962 cancel token 2024-03-07 19:40:15 +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
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
chenhao 4cda86c8e4 Merge pull request 'by Robin at 20240222; add mobile phone get' (#126) from feat-IRONFANS-57-Robin into test
Reviewed-on: #126
2024-02-22 15:22:38 +08:00
Leufolium 7e967887d9 by Robin at 20240222; add mobile phone get 2024-02-22 15:20:26 +08:00
Leufolium 582cb27830 Merge branch 'feat-IRONFANS-54-Robin' into conflict 2024-02-22 14:39:53 +08:00
lwl0608 272210b23a add recover 2024-02-20 00:37:13 +08:00
Leufolium 5079d25bb3 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-07 13:51:00 +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
lwl0608 ccf4417659 Merge branch 'dev-lwl/wechat' 2024-02-05 23:25:47 +08:00
lwl0608 cb718d1850 Merge branch 'dev-lwl/wechat' into test 2024-02-05 21:17:06 +08:00
lwl0608 2261c021fa add config 2024-02-05 21:16:49 +08:00
chenhao b7648251ec Merge pull request 'by Robin at 20240205' (#99) from feat-IRONFANS-40-20240125-Robin into test
Reviewed-on: #99
2024-02-05 19:06:57 +08:00
Leufolium 9178b4a5ce by Robin at 20240205 2024-02-05 19:06:42 +08:00
Leufolium 2664c50ce4 Merge branch 'feat-IRONFANS-40-20240125-Robin' into conflict-test-feat-IRONFANS-40 2024-02-05 18:55:53 +08:00
Leufolium 27e8d492cc Merge remote-tracking branch 'origin/main' into feat-IRONFANS-40-20240125-Robin 2024-02-05 18:51:18 +08:00
Leufolium 9e85281c9f by Robin at 20240205; add op moment list by mid 2024-02-05 18:47:51 +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
chenhao c7962fa4e8 Merge pull request 'feat-IRONFANS-40-20240125-Robin' (#90) from feat-IRONFANS-40-20240125-Robin into main
Reviewed-on: #90
2024-02-04 08:04:44 +08:00
lwl0608 d4011adb92 deal_one_order 2024-02-03 17:23:08 +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
chenhao b645981428 Merge pull request 'by Robin at 20240127; add op list by mid account' (#83) from feat-IRONFANS-40-20240125-Robin into test
Reviewed-on: #83
2024-01-27 16:51:15 +08:00
Leufolium 9297aa8fbd by Robin at 20240127; add op list by mid account 2024-01-27 16:50:39 +08:00
Leufolium de3619efe3 by Robin at 20240125; get_coins_product_list not token auth 2024-01-25 09:50:08 +08:00
Leufolium 3e484d0e31 by Robin at 20240125; apipaycallback not token auth 2024-01-25 09:44:53 +08:00
Leufolium 12ee83520f by Robin at 20240125; add token auth 2024-01-25 08:59:52 +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
lwl0608 e3abdff08c opt 2024-01-21 12:27:34 +08:00
lwl0608 7fff48036d op coin_order_list 2024-01-17 22:11:12 +08:00
lwl0608 c6085f42d6 op order_list 2024-01-17 21:57:45 +08:00
Leufolium 26c55749a0 by Robin at 20240113; moment 2024-01-13 00:32:19 +08:00
Leufolium adeb7cea44 by Robin at 20240110; fix un-jwt auth 2024-01-10 22:01:16 +08:00
lwl0608 537ed90d65 withdraw apply 2024-01-08 11:49:16 +08:00
lwl0608 9f2b80566e add 2024-01-07 22:37:06 +08:00
Leufolium 82985d051c by Robin at 20240103; fix 2024-01-03 22:53:53 +08:00
Leufolium 3cc042ba66 by Robin at 20230103; add daily statement 2024-01-03 16:16:41 +08:00
Leufolium db6670572e by Robin at 20230102; account count 2024-01-02 19:34:05 +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
lwl0608 5d8fda536a add check 2023-12-29 21:30:59 +08:00
lwl0608 15e8c2b6c6 fix 2023-12-29 17:33:56 +08:00
lwl0608 dfe353abe5 fix 2023-12-29 17:25:13 +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
lwl0608 0ebb07f1e1 invalid 2023-12-25 01:14:14 +08:00
Leufolium 562ff379b8 by Robin at 20231224; PrepareToC 2023-12-24 15:53:20 +08:00
Leufolium bb9f771189 by Robin at 20231223; session 2023-12-23 22:06:36 +08:00
Leufolium 7ea7b36776 by Robin at 20231223; contact session 2023-12-23 22:03:53 +08:00
Leufolium a39852ff69 by Robin at 20231222; op list by userid 2023-12-22 17:00:57 +08:00
lwl0608 9a00286db6 service 2023-12-21 22:17:40 +08:00