Commit Graph

1044 Commits

Author SHA1 Message Date
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
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
chenhao 136f96fdf5 Merge pull request 'by Robin at 20240613' (#531) from feat-IRONFANS-122-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/531
2024-06-13 13:21:00 +08:00
Leufolium 601b8a5888 by Robin at 20240613 2024-06-13 13:20:43 +08:00
chenhao 7e7e21a3aa Merge pull request 'by Robin at 20240613' (#530) from feat-IRONFANS-147-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/530
2024-06-13 12:56:45 +08:00
Leufolium e5fa00114c by Robin at 20240613 2024-06-13 12:56:29 +08:00
chenhao a614e015a4 Merge pull request 'feat-IRONFANS-147-Robin' (#529) from feat-IRONFANS-147-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/529
2024-06-13 12:32:16 +08:00
Leufolium b45bddf849 by Robin at 20240613 2024-06-13 12:29:14 +08:00
lwl0608 3cf7e543fd t 2024-06-12 15:12:24 +08:00
Leufolium 559976b33a by Robin at 20240611 2024-06-11 19:40:35 +08:00
lwl0608 7df284d010 f 2024-06-09 00:02:37 +08:00
chenhao 624a521ad1 Merge pull request 'by Robin at 20240607; refund rate' (#526) from feat-IRONFANS-144-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/526
2024-06-07 16:45:39 +08:00
Leufolium 4a57f04cf4 by Robin at 20240607; refund rate 2024-06-07 16:45:01 +08:00
lwl0608 551b9f10ee x 2024-06-05 10:53:18 +08:00
lwl0608 8ba557f493 add applepay_callback 2024-06-05 10:52:59 +08:00
lwl0608 3a4f4aacd2 fix 2024-06-04 17:50:03 +08:00
lwl0608 39ddeb698b merge 2024-06-04 17:46:47 +08:00
lwl0608 8bf8e9357f create order. add paytype: coin 2024-06-04 17:44:06 +08:00
Leufolium 192b5c180e Merge remote-tracking branch 'origin/main' into test 2024-06-04 17:21:52 +08:00
chenhao 9358a749c7 Merge pull request 'feat-IRONFANS-58-Robin' (#524) from feat-IRONFANS-58-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/524
2024-06-04 17:17:15 +08:00