Commit Graph

967 Commits

Author SHA1 Message Date
lwl0608 b6338fb391 search 2024-08-14 11:01:03 +08:00
lwl0608 dd7b04a6df Merge branch 'dev_add_shuilai' 2024-08-12 14:17:18 +08:00
Leufolium 840867eb71 Merge branch 'feat-IRONFANS-185-Robin' into mainconflict 2024-08-09 18:18:11 +08:00
lwl0608 8fa1d27868 shuilai tf 2024-08-09 15:07:58 +08:00
chenhao ac4bebbf2a Merge pull request 'feat-IRONFANS-191-Robin' (#694) from feat-IRONFANS-191-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/694
2024-08-08 18:01:50 +08:00
Leufolium 75d7645bfb by Robin at 20240808 2024-08-08 17:29:32 +08:00
Leufolium 50d3ab3040 by Robin at 20240808 2024-08-08 16:04:50 +08:00
Leufolium d33f3f212a by Robin at 20240807 2024-08-07 22:22:32 +08:00
Leufolium 145691fd65 by Robin at 20240807 2024-08-07 16:08:32 +08:00
lwl0608 3c1841d8d9 order from 2024-08-07 14:08:24 +08:00
chenhao f0fe54bc0e Merge pull request 'feat-IRONFANS-192-Robin' (#685) from feat-IRONFANS-192-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/685
2024-08-06 18:38:43 +08:00
Leufolium c46ef27288 1 2024-08-06 18:06:05 +08:00
Leufolium 99e9c625cd 1 2024-08-06 18:03:59 +08:00
Leufolium f73d0f9a75 by Robin at 20240806 2024-08-06 14:12:48 +08:00
Leufolium e545065893 1 2024-08-06 13:32:08 +08:00
lwl0608 a2c9915525 withdarw sub msg 2024-08-06 11:40:02 +08:00
lwl0608 cce6f9976c add toast 2024-08-06 11:31:35 +08:00
Leufolium 98f605c265 Merge branch 'feat-IRONFANS-176-Robin' into mainconf 2024-08-01 22:34:08 +08:00
Leufolium 191123ca64 1 2024-08-01 20:38:22 +08:00
Leufolium 71df61c5ff by Robin at 20240801 2024-08-01 20:22:48 +08:00
Leufolium 0b2c83e215 by Robin at 20240801 2024-08-01 16:52:27 +08:00
Leufolium 7ec3af4584 by Robin at 20240801 2024-08-01 16:21:48 +08:00
lwl0608 739b1c6a6d chagne ch 2024-08-01 16:08:23 +08:00
lwl0608 855f39cfa8 fix 2024-08-01 15:57:40 +08:00
lwl0608 bd240d08f3 fix 2024-08-01 14:58:37 +08:00
lwl0608 d4f116de18 x 2024-08-01 14:38:55 +08:00
lwl0608 5f30544f99 fix ch 2024-08-01 14:38:55 +08:00
lwl0608 2103e5a723 ignore pay refund 2024-08-01 14:04:27 +08:00
lwl0608 f8a4c0fbe7 Merge branch 'add_raven' 2024-08-01 10:35:00 +08:00
Leufolium 2793aff71d Merge remote-tracking branch 'origin/feat-IRONFANS-173-Robin' into mainconflict 2024-07-31 22:14:57 +08:00
Leufolium b4e6c2532b 1 2024-07-31 21:59:39 +08:00
Leufolium bbb3f06e3a 1 2024-07-31 16:50:37 +08:00
lwl0608 6fd0d75f5c add lanxing 02 2024-07-31 16:43:03 +08:00
Leufolium 70febfc421 by Robin at 20240731 2024-07-31 16:08:51 +08:00
lwl0608 96325994ea fix code 2024-07-31 14:55:16 +08:00
chenhao d24ed470b0 Merge pull request 'by Robin at 20240729' (#662) from BUG-20240729 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/662
2024-07-30 19:10:58 +08:00
Leufolium 7af7d2d6f1 by Robin at 20240730 2024-07-30 18:40:15 +08:00
Leufolium d9ef34138b 1 2024-07-30 15:35:27 +08:00
Leufolium c6e1a41288 by Robin at 20240730; add delay 2024-07-30 12:15:01 +08:00
Leufolium 2e08c98384 1 2024-07-30 12:08:21 +08:00
lwl0608 739cc1dd11 fix outer raven 2024-07-29 19:29:34 +08:00
Leufolium 8fcef422bb by Robin at 20240729 2024-07-29 15:48:39 +08:00
lwl0608 759a138d06 outer raven 2024-07-29 15:33:42 +08:00
Leufolium 5eeebd4206 by Robin at 20240729 2024-07-29 13:15:11 +08:00
Leufolium ae595246be by Robin at 20240726 2024-07-26 12:58:48 +08:00
Leufolium 34bbcdf627 1 2024-07-25 21:37:50 +08:00
Leufolium 8eec2ba0ee by Robin at 20240725 2024-07-25 21:35:25 +08:00
Leufolium 4caefe3025 1 2024-07-25 20:29:08 +08:00
Leufolium bb2c18fa4b 1 2024-07-25 20:11:38 +08:00
Leufolium 2ea3ebb6aa by Robin at 20240725 2024-07-25 19:59:35 +08:00
Leufolium 2a7c04d4ea 1 2024-07-25 17:49:13 +08:00
lwl0608 33e8d70e24 fix panic 2024-07-24 16:42:49 +08:00
Leufolium d74af2c693 By Robin at 20240724 2024-07-24 14:14:26 +08:00
Leufolium 9467b15d29 Merge branch 'feat-IRONFANS-163-Robin' into mainconf 2024-07-23 17:38:33 +08:00
Leufolium c5343564e3 1 2024-07-23 17:04:07 +08:00
Leufolium 24b52988f2 by Robin at 20240723 2024-07-23 16:37:16 +08:00
Leufolium f83058dc25 Merge branch 'feat-IRONFANS-148-Robin' into mainconf 2024-07-22 19:11:15 +08:00
Leufolium 6b800705c5 1 2024-07-22 16:12:22 +08:00
Leufolium de7adf04e8 1 2024-07-22 15:57:56 +08:00
Leufolium 62efdad5c0 1 2024-07-22 13:45:57 +08:00
Leufolium b283c34f44 by Robin at 20240722 2024-07-22 09:17:49 +08:00
lwl0608 9808ff020f Merge branch 'dev-lwl/rollback_zone_status' 2024-07-19 20:37:20 +08:00
lwl0608 bf994af7ab fix errmsg 2024-07-19 20:37:08 +08:00
Leufolium 2167befc4d 1 2024-07-19 18:31:15 +08:00
Leufolium 8ac99776b2 by Robin at 20240719 2024-07-19 18:11:32 +08:00
lwl0608 4211c887cf fix 2024-07-19 17:53:54 +08:00
Leufolium de756dab19 1 2024-07-19 17:46:58 +08:00
lwl0608 9157c5fa08 fix 2024-07-19 17:46:33 +08:00
lwl0608 9c2ba123a2 rollback_zone_exit_status 2024-07-19 11:02:34 +08:00
Leufolium 98c6ef4f36 1 2024-07-19 08:43:30 +08:00
Leufolium ea7d25b0a9 by Robin at 20240719 2024-07-19 08:32:59 +08:00
Leufolium 0665b22b3f Merge branch 'main' into feat-IRONFANS-163-Robin 2024-07-18 22:27:10 +08:00
Leufolium 9b0b943691 1 2024-07-18 22:02:31 +08:00
Leufolium b96a1eaefd by Robin at 20240718 2024-07-18 19:30:59 +08:00
Leufolium 74183a0331 by Robin at 20240718 2024-07-18 19:29:11 +08:00
Leufolium 7c24f50709 1 2024-07-17 18:32:14 +08:00
lwl0608 2ecaa31ad2 add tiefanzone wxpay 2024-07-17 18:06:39 +08:00
Leufolium 02e9883ffe by Robin at 20240717 2024-07-17 17:55:46 +08:00
lwl0608 f01f9a3ecb 1 2024-07-17 17:51:08 +08:00
Leufolium 7d22149037 1 2024-07-17 17:12:37 +08:00
Leufolium 441433e65c by Robin at 20240717 2024-07-17 17:10:04 +08:00
Leufolium 8fc078e3c9 by Robin at 20240717 2024-07-17 12:53:42 +08:00
Leufolium ca8536855c 1 2024-07-17 12:02:39 +08:00
Leufolium 9663b7121e by Robin at 20240717 2024-07-17 12:01:56 +08:00
Leufolium 88074a9b19 1 2024-07-17 08:44:26 +08:00
Leufolium 30542411c4 1 2024-07-15 18:12:20 +08:00
Leufolium 3af5833d73 by Robin at 20240711 2024-07-11 15:43:23 +08:00
Leufolium f9924cb7cb 1 2024-07-11 15:37:39 +08:00
Leufolium b4418e23bb 1 2024-07-11 15:36:55 +08:00
lwl0608 7c510f0e3f Merge branch 'dev-lwl/add_alipay_clients' 2024-07-11 15:13:12 +08:00
Leufolium 2af8e89b0d 1 2024-07-11 15:07:10 +08:00
Leufolium b2b2f9df38 1 2024-07-11 15:01:02 +08:00
Leufolium f03f172a8d by Robin at 20240711 2024-07-11 14:53:43 +08:00
chenhao 2819f588f4 Merge pull request 'by Robin at 20240710' (#611) from feat-IRONFANS-157-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/611
2024-07-11 13:09:08 +08:00
lwl0608 3bd6b9352d fix lanxing 02 2024-07-11 11:17:13 +08:00
Leufolium cd6b6de15b by Robin at 20240711 2024-07-11 11:10:25 +08:00
lwl0608 e3adc95d15 add random pay 2024-07-11 10:03:25 +08:00
Leufolium 87fc79d62a by Robin at 20240711 2024-07-11 08:14:34 +08:00
Leufolium e47ed25ed0 by Robin at 20240710 2024-07-10 05:47:56 +08:00
Leufolium 739b47f032 by Robin at 20240710 2024-07-10 05:18:02 +08:00
Leufolium 883db65ea4 1 2024-07-09 21:54:04 +08:00
Leufolium 8990758254 by Robin at 20240709 2024-07-09 21:02:18 +08:00
lwl0608 bfc5c9f810 black 2024-07-09 09:47:28 +08:00
lwl0608 f45ec3e11e fix 2024-07-08 02:00:53 +08:00
lwl0608 72d2521a3b fix 2024-07-08 01:56:50 +08:00
Leufolium 518b494873 1 2024-07-05 16:59:39 +08:00
Leufolium cdcf23db57 1 2024-07-05 16:55:10 +08:00
Leufolium 080c9749b7 by Robin at 20240705 2024-07-05 16:50:29 +08:00
Leufolium ffcd559825 by Robin at 20240705 2024-07-05 16:47:36 +08:00
Leufolium c2567cbab4 by Robin at 20240705 2024-07-05 16:26:36 +08:00
lwl0608 655eb0368d create order blacklist 2024-07-04 14:11:57 +08:00
lwl0608 425c0eddc9 优化 parse notify 2024-07-04 11:39:10 +08:00
Leufolium 57d6fb8fdf Merge remote-tracking branch 'origin/main' into feat-IRONFANS-148-Robin 2024-07-04 10:06:48 +08:00
Leufolium 3e2812dd15 by Robin at 20240704 2024-07-04 09:51:42 +08:00
Leufolium eec64155c0 by Robin at 20240704 2024-07-04 09:34:42 +08:00
Leufolium ee862c8a2d by Robin at 20240704 2024-07-04 09:26:52 +08:00
chenhao 9a659d9b74 Merge pull request 'by Robin at 20240701' (#592) from feat-pay_add_token into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/592
2024-07-03 17:15:54 +08:00
Leufolium d33813ee61 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-139-Robin 2024-07-03 16:53:02 +08:00
Leufolium 8822343f44 by Robin at 20240703 2024-07-03 16:43:58 +08:00
Leufolium 6979bbc09f by Robin at 20240703 2024-07-03 16:36:31 +08:00
lwl0608 0dc67b4291 lanxing 01 2024-07-03 16:05:46 +08:00
lwl0608 6f6cf0c7cf add xl01 2024-07-03 15:54:41 +08:00
Leufolium 551d420c3f by Robin at 20240703 2024-07-03 15:13:04 +08:00
chenhao 688470d37a Merge pull request 'feat-IRONFANS-160-Robin' (#586) from feat-IRONFANS-160-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/586
2024-07-02 21:12:59 +08:00
Leufolium 561df91f82 1 2024-07-02 19:57:28 +08:00
Leufolium 0836a4baea by Robin at 20240702 2024-07-02 19:53:29 +08:00
Leufolium c022b0246a 1 2024-07-02 18:42:32 +08:00
Leufolium 7dcde6a448 by Robin at 20240702 2024-07-02 17:15:54 +08:00
Leufolium c9e50ef864 by Robin at 20240702 2024-07-02 16:29:08 +08:00
Leufolium 302adfee08 by Robin at 20240702 2024-07-02 08:52:13 +08:00
Leufolium f25164c742 by Robin at 20240702 2024-07-02 08:37:56 +08:00
Leufolium dc184f040e by Robin at 20240702 2024-07-02 08:32:37 +08:00
Leufolium 82a7b94f0e by Robin at 20240702 2024-07-02 05:49:27 +08:00
Leufolium be67c8f461 by Robin at 20240701 2024-07-01 17:55:41 +08:00
lwl0608 8d170ef8ef Merge branch 'dev_lwl' 2024-07-01 17:07:44 +08:00
lwl0608 8147201960 fix 2024-07-01 17:07:38 +08:00
lwl0608 0241e75edb merge 2024-07-01 16:00:39 +08:00
lwl0608 e19471c4bd fix 2024-07-01 15:59:42 +08:00
chenhao 07c2a01aaa Merge pull request 'by Robin at 20240628' (#576) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/576
2024-06-28 23:32:59 +08:00
Leufolium 02ee882bd5 by Robin at 20240628 2024-06-28 23:32:44 +08:00
chenhao b468b42b5c Merge pull request 'by Robin at 20240628' (#575) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/575
2024-06-28 23:25:49 +08:00
Leufolium 1575046a98 by Robin at 20240628 2024-06-28 23:25:22 +08:00
chenhao 19bc740f7f Merge pull request 'by Robin at 20240628' (#575) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/575
2024-06-28 23:13:58 +08:00
Leufolium 3a83ade89f by Robin at 20240628 2024-06-28 23:13:21 +08:00
lwl0608 ef7894de9a jwt 2024-06-28 22:37:42 +08:00
lwl0608 a54cd4fce4 jwt 2024-06-28 22:36:54 +08:00
chenhao 2bf04aac1b Merge pull request 'by Robin at 20240628' (#574) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/574
2024-06-28 20:39:51 +08:00
Leufolium 213cc36149 by Robin at 20240628 2024-06-28 20:39:34 +08:00
chenhao 06bc65c750 Merge pull request 'by Robin at 20240628' (#573) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/573
2024-06-28 20:28:48 +08:00
Leufolium d01ad4bdac by Robin at 20240628 2024-06-28 20:28:32 +08:00