Commit Graph

745 Commits

Author SHA1 Message Date
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
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 e56ec4861b fix zone moment 2024-06-24 16:00:25 +08:00
Leufolium 900a803525 by Robin at 20240621 2024-06-21 21:28:16 +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
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
Leufolium e6d1b90338 by Robin at 20240619 2024-06-19 13:58:47 +08:00
Leufolium c0ccf23922 by Robin at 20240618 2024-06-18 21:58:29 +08:00
Leufolium 6dc4d0d736 by Robin at 20240618 2024-06-18 21:34:45 +08:00
Leufolium 440fcae93a by Robin at 20240618 2024-06-18 20:13:12 +08:00
Leufolium 4c0a61be43 by Robin at 20240618 2024-06-18 20:07:42 +08:00
Leufolium 074d04b420 1 2024-06-18 19:51:22 +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 0e3e21cd86 create_order_wx_pub 2024-06-15 14:33:15 +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 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 59f495b266 fix 优化 2024-06-14 18:58:03 +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 67f144144f fix 2024-06-14 10:26:00 +08:00
lwl0608 064300871b fix 2024-06-14 10:20:08 +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 da7a84905b applepay 2024-06-13 16:44:15 +08:00
lwl0608 571a961151 apple 2024-06-13 16:40:22 +08:00
Leufolium 601b8a5888 by Robin at 20240613 2024-06-13 13:20:43 +08:00
Leufolium e5fa00114c by Robin at 20240613 2024-06-13 12:56:29 +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
Leufolium 4a57f04cf4 by Robin at 20240607; refund rate 2024-06-07 16:45:01 +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 8bf8e9357f create order. add paytype: coin 2024-06-04 17:44:06 +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
Leufolium 84c371ca33 by Robin at 20240604 2024-06-04 17:03:14 +08:00
Leufolium 10636fa6a4 by Robin at 20240604 2024-06-04 12:16:17 +08:00
lwl0608 7af540c2a7 Merge branch 'main' into dev-lwl/consul 2024-06-03 10:08:45 +08:00
Leufolium 3d2cc139d6 by Robin at 20240530 2024-05-30 16:01:19 +08:00
Leufolium eeb5baf1bf by Robin at 20240530 2024-05-30 15:52:49 +08:00
Leufolium ba5cd815ad by Robin at 20240530 2024-05-30 15:37:56 +08:00
Leufolium a6e3a3ee12 by Robin at 20240530 2024-05-30 15:23:40 +08:00
Leufolium 7b237ed87e 1 2024-05-30 14:58:00 +08:00
Leufolium c9e6889aa2 by Robin at 20240530 2024-05-30 14:53:38 +08:00
lwl0608 dcf2057a86 redirect url 2024-05-30 11:09:59 +08:00
lwl0608 1920418c31 fix 2024-05-30 09:48:09 +08:00
lwl0608 10e55130a9 fix s w 2024-05-29 16:57:45 +08:00
lwl0608 c5caa7bb75 superfan unlock wechat 2024-05-29 16:14:50 +08:00
lwl0608 6d1e62324e manual unlock wechat 2024-05-29 15:26:24 +08:00
lwl0608 4887207e0a withdraw recover 2024-05-29 14:35:52 +08:00
lwl0608 cc93c10aa2 退款 2024-05-29 10:56:52 +08:00
Leufolium d9d60f69a6 by Robin at 20240529 2024-05-29 10:48:29 +08:00
Leufolium 690a5b31f6 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-125-Robin 2024-05-28 13:11:21 +08:00
Leufolium f780b95506 by Robin 2024-05-28 13:09:59 +08:00
lwl0608 fe3cb342d6 fix yeepay callback 2024-05-27 19:37:52 +08:00
lwl0608 49561af1de fix yeepay callback 2024-05-27 19:23:05 +08:00
lwl0608 f34bf3670e yop 2024-05-27 16:48:25 +08:00
chenhao 2ff7822af8 Merge pull request 'feat-IRONFANS-133-Robin' (#510) from feat-IRONFANS-133-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/510
2024-05-27 16:28:00 +08:00
Leufolium ef00b9a1b7 by Robin at 20240525 2024-05-25 19:02:05 +08:00
Leufolium c8f9f00a13 by Robin at 20240525 2024-05-25 18:20:49 +08:00
Leufolium 6c3fea0d1c by Robin at 20240525 2024-05-25 13:14:10 +08:00
chenhao ba5d4f00f0 Merge pull request 'by Robin at 20240525; set ztp=nil if no ztp exists' (#503) from feat-IRONFANS-118-Robin-2 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/503
2024-05-25 12:03:46 +08:00
Leufolium 531c84a2ea by Robin at 20240525; set ztp=nil if no ztp exists 2024-05-25 12:03:17 +08:00
chenhao 2e572ca814 Merge pull request 'by Robin at 20240525' (#501) from feat-IRONFANS-118-Robin-2 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/501
2024-05-25 01:16:18 +08:00
Leufolium e72cd3e2c0 by Robin at 20240525 2024-05-25 01:15:47 +08:00
Leufolium 39d95f6ba8 by Robin at 20240524 2024-05-24 23:27:51 +08:00
Leufolium e141dc412c By Robin at 20240524 2024-05-24 23:27:05 +08:00
Leufolium 0d6a991101 by Robin at 20240524 2024-05-24 22:43:39 +08:00
Leufolium 5d67f05fd0 by Robin at 20240524 2024-05-24 22:24:27 +08:00
Leufolium 4bdee904d9 init offline 2024-05-24 08:59:21 +08:00
Leufolium 4983f71f0e by RObin 2024-05-24 04:30:34 +08:00
Leufolium c2c8125b5f by 2024-05-24 03:52:57 +08:00
Leufolium dacbdcdd5d 111 2024-05-24 03:34:47 +08:00
chenhao 31ac9a3b98 revert 4f67673057
revert by Robin at 20240524
2024-05-24 03:32:04 +08:00
Leufolium 4f67673057 by Robin at 20240524 2024-05-24 03:18:12 +08:00
Leufolium 248b93ced7 by Robin at 20240524 2024-05-24 02:52:23 +08:00
Leufolium 3c694f7995 1 2024-05-24 02:44:46 +08:00
Leufolium f7f0e53d5d by Robin at 20240524 2024-05-24 02:34:31 +08:00
Leufolium a54361d249 by Robin at 20240523 2024-05-23 23:59:14 +08:00
Leufolium ffececc65a by Robin at 20240523 2024-05-23 23:01:30 +08:00
Leufolium 124dd84c83 by Robin at 20240523 2024-05-23 22:39:37 +08:00
Leufolium 8d36ca1d37 by Robin at 20240523 2024-05-23 17:11:14 +08:00
Leufolium 36f87c275e by Robin at 20240522 2024-05-22 23:35:07 +08:00
Leufolium a7e01c4dec by Robin at 20240522 2024-05-22 23:20:27 +08:00
Leufolium 3b9f56d149 by Robin at 20240522 2024-05-22 22:56:47 +08:00