wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,782 Commits 107 Branches 0 Tags 48 MiB
Commit Graph

1262 Commits

Author SHA1 Message Date
chenhao adad3942a0 Merge pull request 'feat-IRONFANS-148-Robin' (#597) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/597
 2024-07-05 16:48:13 +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 8a13ba05de Merge branch 'dev-lwl/add_withdraw_log' into test 2024-07-04 14:12:09 +08:00
lwl0608 655eb0368d create order blacklist 2024-07-04 14:11:57 +08:00
Leufolium 7900eed8d9 1 2024-07-04 13:34:52 +08:00
lwl0608 425c0eddc9 优化 parse notify 2024-07-04 11:39:10 +08:00
Leufolium 876c0ccfbc Merge branch 'feat-IRONFANS-148-Robin' into conf 2024-07-04 10:08:28 +08:00
Leufolium 57d6fb8fdf Merge remote-tracking branch 'origin/main' into feat-IRONFANS-148-Robin 2024-07-04 10:06:48 +08:00
Leufolium f0f8eff7af Merge remote-tracking branch 'origin/main' into test 2024-07-04 10:03:51 +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 b035e3430f Merge branch 'dev-lwl/add_alipay_clients' into test 2024-07-03 15:54:50 +08:00
lwl0608 6f6cf0c7cf add xl01 2024-07-03 15:54:41 +08:00
Leufolium 1323aef6db Merge branch 'feat-IRONFANS-139-Robin' into conflict 2024-07-03 15:15:29 +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
chenhao 963ae63c08 Merge pull request '1' (#585) from feat-IRONFANS-139-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/585
 2024-07-02 19:57:58 +08:00
Leufolium 561df91f82 1 2024-07-02 19:57:28 +08:00
Leufolium 9585090251 Merge branch 'feat-IRONFANS-139-Robin' into test 2024-07-02 19:55:25 +08:00
Leufolium 0836a4baea by Robin at 20240702 2024-07-02 19:53:29 +08:00
chenhao 1bdbf9d2f7 Merge pull request '1' (#583) from feat-IRONFANS-160-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/583
 2024-07-02 18:42:53 +08:00
Leufolium c022b0246a 1 2024-07-02 18:42:32 +08:00
chenhao 1983265147 Merge pull request 'by Robin at 20240702' (#580) from feat-IRONFANS-158-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/580
 2024-07-02 17:16:22 +08:00
Leufolium 7dcde6a448 by Robin at 20240702 2024-07-02 17:15:54 +08:00
chenhao e7f4943ffd Merge pull request 'by Robin at 20240702' (#579) from feat-IRONFANS-160-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/579
 2024-07-02 16:29:30 +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 8405d6f187 Merge remote-tracking branch 'origin/main' into conf 2024-07-01 18:00:36 +08:00
Leufolium be67c8f461 by Robin at 20240701 2024-07-01 17:55:41 +08:00
lwl0608 a7cdcf7bd4 Merge branch 'dev_lwl' into test 2024-07-01 17:07:50 +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 f6623d9a43 merge 2024-07-01 16:01:48 +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
chenhao dd98bbf779 Merge pull request 'by Robin at 20240628' (#572) from feat-IRONFANS-148-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/572
 2024-06-28 18:02:31 +08:00
Leufolium e919a70b1d by Robin at 20240628 2024-06-28 18:02:13 +08:00
chenhao c5ba290745 Merge pull request 'by Robin at 20240628' (#571) from feat-IRONFANS-148-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/571
 2024-06-28 16:10:39 +08:00
Leufolium af2c2fc366 by Robin at 20240628 2024-06-28 16:10:17 +08:00
chenhao b167ff5aaa Merge pull request 'by Robin at 20240628' (#570) from feat-IRONFANS-148-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/570
 2024-06-28 15:47:54 +08:00
Leufolium 2e9177c65c by Robin at 20240628 2024-06-28 15:47:40 +08:00
chenhao 817ceb47a2 Merge pull request 'by Robin at 20240628' (#569) from feat-IRONFANS-148-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/569
 2024-06-28 15:35:57 +08:00
Leufolium 4960594228 by Robin at 20240628 2024-06-28 15:35:12 +08:00
chenhao 5243d1e44a Merge pull request 'feat-IRONFANS-148-Robin' (#568) from feat-IRONFANS-148-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/568
 2024-06-28 14:36:43 +08:00
Leufolium 361c7b33b8 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-148-Robin 2024-06-28 14:35:10 +08:00
lwl0608 731f0f0db7 Merge branch 'dev-lwl/withhh' into test 2024-06-28 14:33:19 +08:00
lwl0608 bbc808e27a fix 2024-06-28 14:33:01 +08:00
chenhao c887c8238b Merge pull request 'feat-IRONFANS-120-Robin' (#566) from feat-IRONFANS-120-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/566
 2024-06-27 22:08:13 +08:00
chenhao e1d6fb9b15 Merge pull request 'by Robin at 20240627' (#565) from feat-IRONFANS-120-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/565
 2024-06-27 18:31:56 +08:00
Leufolium 3a1e5bfe9d by Robin at 20240627 2024-06-27 18:31:41 +08:00
Leufolium 2f089b0113 Merge branch 'feat-IRONFANS-139-Robin' into conf 2024-06-27 18:20:52 +08:00
Leufolium 6b730ba361 by Robin at 20240627 2024-06-27 18:19:11 +08:00
lwl0608 15fc9e3212 add create order freeze 2024-06-27 17:23:48 +08:00
chenhao 837a98c7fc Merge pull request 'by Robin at 20240627' (#561) from BUG-20240627-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/561
 2024-06-27 15:21:05 +08:00
Leufolium 66270eb80d by Robin at 20240627 2024-06-27 15:20:21 +08:00
chenhao 2f1d45a898 Merge pull request '1' (#560) from feat-IRONFANS-120-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/560
 2024-06-26 18:13:24 +08:00
Leufolium ef33c42e0d 1 2024-06-26 18:13:09 +08:00
Leufolium 7bf51c7a87 Merge branch 'feat-IRONFANS-120-Robin' into conflict 2024-06-26 17:39:27 +08:00
Leufolium 1124d413fa by Robin at 20240626 2024-06-26 17:37:00 +08:00
chenhao 160e5af3b8 Merge pull request 'feat-IRONFANS-148-Robin' (#557) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/557
 2024-06-26 13:31:26 +08:00
Leufolium af835ff284 by Robin at 20240626 2024-06-26 13:30:32 +08:00
Leufolium 7e8c00e926 by Robin at 20240626 2024-06-26 13:26:46 +08:00
chenhao 497647dd99 Merge pull request 'by Robin at 20240626' (#555) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/555
 2024-06-26 12:44:34 +08:00
Leufolium 2cfe121fd1 by Robin at 20240626 2024-06-26 12:40:09 +08:00
Leufolium fd19b615b7 Merge branch 'feat-IRONFANS-148-Robin' into conflict 2024-06-25 18:31:54 +08:00
Leufolium 294f637de0 by Robin at 20240625 2024-06-25 18:23:18 +08:00
Leufolium a59a4ca43f by Robin at 20240625 2024-06-25 17:48:24 +08:00
chenhao 35476f66a6 Merge pull request 'feat-IRONFANS-141-Robin' (#550) from feat-IRONFANS-141-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/550
 2024-06-25 17:44:48 +08:00
chenhao 5566efa436 Merge pull request 'by Robin at 20240624' (#549) from feat-IRONFANS-141-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/549
 2024-06-24 21:33:29 +08:00
Leufolium 5fcfea53ab by Robin at 20240624 2024-06-24 21:30:52 +08:00
Leufolium 45d78dfd17 1 2024-06-24 21:24:08 +08:00
Leufolium 813636ca8f by Robin at 20240624 2024-06-24 19:14:31 +08:00
lwl0608 5f86fc08bb merge 2024-06-24 16:01:26 +08:00
lwl0608 e56ec4861b fix zone moment 2024-06-24 16:00:25 +08:00
chenhao aebca4b24d Merge pull request 'by Robin at 20240621' (#548) from feat-IRONFANS-141-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/548
 2024-06-21 21:28:28 +08:00
Leufolium 900a803525 by Robin at 20240621 2024-06-21 21:28:16 +08:00
Leufolium ce2931c057 1 2024-06-21 20:36:59 +08:00
Leufolium 210555f7d5 Merge branch 'feat-IRONFANS-141-Robin' into conf 2024-06-21 20:33:44 +08:00
Leufolium 177a95ac35 by Robin at 20240621 2024-06-21 20:28:40 +08:00
Leufolium 41cf08be7c by Robin at 20240621 2024-06-21 19:51:55 +08:00
chenhao f7e6647b64 Merge pull request 'by Robin at 20240621' (#544) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/544
 2024-06-21 18:26:21 +08:00
chenhao ac3040a3eb Merge pull request 'main' (#543) from main into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/543
 2024-06-21 18:26:04 +08:00
Leufolium 9ee568f858 by Robin at 20240621 2024-06-21 18:25:24 +08:00
lwl0608 b83aab01a7 fix 2024-06-19 21:56:57 +08:00
lwl0608 ff0c463020 fix update status 2024-06-19 21:10:46 +08:00
chenhao 606c7030a9 Merge pull request 'by Robin at 20240619' (#542) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/542
 2024-06-19 13:59:36 +08:00
Leufolium e6d1b90338 by Robin at 20240619 2024-06-19 13:58:47 +08:00
chenhao c9157d6a85 Merge pull request 'by Robin at 20240618' (#541) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/541
 2024-06-18 21:58:54 +08:00
Leufolium c0ccf23922 by Robin at 20240618 2024-06-18 21:58:29 +08:00
chenhao fe128454f7 Merge pull request 'by Robin at 20240618' (#540) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/540
 2024-06-18 21:34:59 +08:00
Leufolium 6dc4d0d736 by Robin at 20240618 2024-06-18 21:34:45 +08:00
chenhao 2a6c6197cb Merge pull request 'by Robin at 20240618' (#539) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/539
 2024-06-18 20:13:34 +08:00
Leufolium 440fcae93a by Robin at 20240618 2024-06-18 20:13:12 +08:00
chenhao d8151b4368 Merge pull request 'by Robin at 20240618' (#538) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/538
 2024-06-18 20:08:08 +08:00
Leufolium 4c0a61be43 by Robin at 20240618 2024-06-18 20:07:42 +08:00
chenhao 461baa8fcb Merge pull request '1' (#537) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/537
 2024-06-18 19:51:37 +08:00
Leufolium 074d04b420 1 2024-06-18 19:51:22 +08:00
Leufolium 4f2d33e674 Merge branch 'feat-IRONFANS-148-Robin' into cfl 2024-06-18 19:46:31 +08:00
Leufolium ae4b8558f3 by Robin at 20240618 2024-06-18 19:40:09 +08:00
Leufolium 324d4bc523 by Robin at 20240618 2024-06-18 17:10:42 +08:00
Leufolium 6159759111 by Robin at 20240617 2024-06-17 22:25:43 +08:00
Leufolium 70422fce3a 1 2024-06-15 19:06:47 +08:00
chenhao 39cb825dcb Merge pull request 'feat-IRONFANS-122-Robin' (#534) from feat-IRONFANS-122-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/534
 2024-06-15 17:58:54 +08:00
lwl0608 6381d071e1 merg 2024-06-15 14:35:43 +08:00
lwl0608 0e3e21cd86 create_order_wx_pub 2024-06-15 14:33:15 +08:00
lwl0608 7d27928218 fix 2024-06-15 14:29:35 +08:00
lwl0608 2cf1c99ce5 fix 2024-06-15 14:26:52 +08:00
Leufolium 400cda2cc3 by Robin at 20240615 2024-06-15 13:41:03 +08:00
lwl0608 591238f896 merge 2024-06-15 13:24:23 +08:00
lwl0608 f27c0b2de9 Merge branch 'dev-lwl/iap' into test 2024-06-15 13:19:24 +08:00
lwl0608 60a9eba321 fix 2024-06-15 13:19:10 +08:00
Leufolium f73dd1cff7 By Robin at 20240615 2024-06-15 11:41:12 +08:00
lwl0608 97393ca46c refund 优化 2024-06-14 18:59:17 +08:00
lwl0608 59f495b266 fix 优化 2024-06-14 18:58:03 +08:00
lwl0608 28d31a6500 fix refund 2024-06-14 18:39:52 +08:00
lwl0608 ba0a6c25fb fix refund 2024-06-14 18:37:50 +08:00
lwl0608 8e4e6087b6 fix 2024-06-14 18:37:42 +08:00
lwl0608 d73163a37f merge 2024-06-14 17:58:43 +08:00
lwl0608 f314affd2b Merge branch 'dev-lwl/iap' into test 2024-06-14 10:26:10 +08:00
lwl0608 67f144144f fix 2024-06-14 10:26:00 +08:00
lwl0608 064300871b fix 2024-06-14 10:20:08 +08:00
chenhao 049f42fa7d Merge pull request 'feat-IRONFANS-122-Robin' (#532) from feat-IRONFANS-122-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/532
 2024-06-13 17:08:50 +08:00
Leufolium 61189f4bbe by Robin at 20240613 2024-06-13 17:08:29 +08:00
Leufolium b6441121fb by Robin at 20240613 2024-06-13 17:07:57 +08:00
lwl0608 25f8306229 Merge branch 'dev-lwl/iap' into test 2024-06-13 16:44:21 +08:00
lwl0608 da7a84905b applepay 2024-06-13 16:44:15 +08:00
lwl0608 d28f58a733 f 2024-06-13 16:43:31 +08:00
lwl0608 571a961151 apple 2024-06-13 16:40:22 +08:00