Commit Graph

277 Commits

Author SHA1 Message Date
Xu Chang 915441477a Merge branch 'dev' of gitea.51mars.com:Oak-Team/oak-pay-business into dev 2024-09-19 19:08:21 +08:00
Xu Chang 24ff33eeb6 适配log的改动 2024-09-19 19:07:57 +08:00
wkj b321f8dd64 user 增加hasPassword 2024-09-15 18:44:06 +08:00
Xu Chang 4560c8629b 适配domain和general的数据结构升级 2024-09-11 15:32:45 +08:00
Xu Chang ef4b75ef05 build 2024-09-09 10:31:43 +08:00
Xu Chang 880b471f8d 适配domain中的log的改动 2024-09-09 10:31:00 +08:00
Xu Chang 12331af0f1 适配新的general的build 2024-08-31 11:30:37 +08:00
Xu Chang 6d6ac55aa6 order中重复的状态定义 2024-08-20 22:00:29 +08:00
Xu Chang 6a45e2411b 增加了smsTemplate 2024-07-18 20:50:06 +08:00
Xu Chang 37c7f6c9e6 build 2024-07-18 20:27:42 +08:00
Xu Chang 96991b9ef0 trigger的进一步修正 2024-07-17 17:22:46 +08:00
Xu Chang 5c6c180c0a trigger对closePay的处理修正(不假设一定有id) 2024-07-17 17:17:00 +08:00
Xu Chang 68b369e42f build 2024-07-16 20:40:10 +08:00
Xu Chang 76e0b18981 pay增加了timeout的处理 2024-07-16 20:15:48 +08:00
Xu Chang a05684af5d 完善了pay/detail中支付异常的行为 2024-07-16 12:52:58 +08:00
Xu Chang 18678f3944 继续更新一些支付实测的小问题 2024-07-12 21:07:26 +08:00
Xu Chang 7bf529cf5f 一个笔误 2024-07-12 20:28:11 +08:00
Xu Chang 2f9e65b38a 支付和退款中的各种小问题 2024-07-12 20:13:55 +08:00
Xu Chang 87b21b9f1a 避免递归访问 2024-07-12 18:49:17 +08:00
Xu Chang eb76b272b0 修正了wechatpay的部分问题,当查询pay状态时进行修正 2024-07-12 17:55:24 +08:00
Xu Chang b21b714a00 Merge branch 'dev' of gitea.51mars.com:Oak-Team/oak-pay-business into dev 2024-07-12 16:01:36 +08:00
lxy 6a2a0c19b3 支付配置wpAccount样式调整 2024-07-12 15:32:34 +08:00
Xu Chang 87545665e1 pay增加了refundNotify 2024-07-12 15:18:58 +08:00
Xu Chang bf04762978 实现了wechatPay的refund接口 2024-07-04 12:31:48 +08:00
Xu Chang 527cebb37e build 2024-07-02 16:15:12 +08:00
lxy 607f483600 适配listPro修改 2024-07-01 18:25:04 +08:00
lxy 8d3e97771d sysAccountOper type修改 2024-06-28 18:04:23 +08:00
Xu Chang 484421a5a9 path增加了一个属性 2024-06-28 16:24:08 +08:00
lxy 6abf338907 action调整 2024-06-28 16:05:11 +08:00
Xu Chang 18069d50ac Merge branch 'dev' of gitea.51mars.com:Oak-Team/oak-pay-business into dev 2024-06-27 18:39:01 +08:00
Xu Chang d7bc1122f1 修改了一些小的声明 2024-06-27 18:38:57 +08:00
lxy 8a3b0a12d0 build 2024-06-27 18:30:13 +08:00
lxy f9b58f983f 系统账户账单 2024-06-27 15:25:59 +08:00
Xu Chang 0beacb0713 Merge branch 'dev' of gitea.51mars.com:Oak-Team/oak-pay-business into dev 2024-06-26 20:04:13 +08:00
Xu Chang bd03f9bd67 设计实现了sysAccountMove 2024-06-26 20:04:08 +08:00
lxy 0bc19ab8df 退款报错提示 2024-06-26 20:00:14 +08:00
lxy 645790d8ec actionAuth修改 2024-06-26 19:14:13 +08:00
lxy c58326d980 fix 2024-06-26 13:45:37 +08:00
Xu Chang ae185dd5a0 更改了account类型的pay的支付逻辑 2024-06-26 10:54:39 +08:00
lxy 077ea74360 当支付关闭时更新order状态 2024-06-25 10:52:33 +08:00
lxy d207d46566 build 2024-06-21 16:37:24 +08:00
Xu Chang ccd723b2d1 checker中异常精细处理处理 2024-06-21 15:22:42 +08:00
Xu Chang a107de3414 给order增加了allowPartialPay属性 2024-06-21 12:02:50 +08:00
Xu Chang 2df190007e order进行startPaying时,要检查其金额是否足额 2024-06-21 10:50:24 +08:00
lxy d85fb0657f build 2024-06-18 16:47:45 +08:00
Xu Chang 5daa4bd0af 增加了从提现页面到提现账号管理页面的链接 2024-06-17 20:35:10 +08:00
Xu Chang 28c92f89e1 在pay/detail支持用户修改externalId 2024-06-17 20:20:28 +08:00
Xu Chang 8b0251aeea Merge branch 'dev' of gitea.51mars.com:Oak-Team/oak-pay-business into dev 2024-06-17 18:34:25 +08:00
Xu Chang fc0504f5ba 对accountOper结构的修正,2.2.0-pub 2024-06-17 18:27:06 +08:00
lxy 3926c529af 样式调整 2024-06-17 14:16:48 +08:00
Xu Chang b5119629d8 actionAuth以及一些页面小细节的调整 2024-06-17 12:15:05 +08:00
Xu Chang c10df08c50 移除了index中对backendContext的引用,降低前台体积 2024-06-16 14:04:30 +08:00
Xu Chang 673cdc4924 merge 2024-06-14 20:18:02 +08:00
Xu Chang 88fb060c67 build 2024-06-13 18:43:46 +08:00
Xu Chang b2da6a225c 一堆后台管理页面和逻辑修正 2024-06-13 18:41:56 +08:00
Xu Chang d45b511891 merge 2024-06-12 17:06:20 +08:00
Xu Chang 7a295aefdb pay和refund的大量逻辑 2024-06-12 17:02:55 +08:00
lxy 10802d6e6f actionAuth调整 2024-06-12 15:34:19 +08:00
lxy 045c7b0902 pay完成支付时,使deposit完成trigger修改 2024-06-12 14:19:02 +08:00
Xu Chang d757f0d572 修正了一些数据结构,规范支付和退款时对account的计算 2024-06-12 12:44:10 +08:00
Xu Chang 4340d8bbe1 增加了sysAccount/survey的部分能力 2024-06-11 18:33:07 +08:00
Xu Chang af04537576 withdraw相应的页面及逻辑 2024-06-10 16:30:01 +08:00
Xu Chang 5fbedb323e 完善了withdraw相关的逻辑和界面 2024-06-09 22:19:17 +08:00
Xu Chang 5b903e9acd 大量关于withdrawAccount的逻辑 2024-06-09 18:25:16 +08:00
Xu Chang dbf236f0c0 删除了withdrawChannel的管理,现在改为自动关联pay的account 2024-06-08 20:44:12 +08:00
lxy fca287127e build 2024-06-07 22:07:18 +08:00
lxy b40c4d8316 build 2024-06-07 22:01:16 +08:00
Xu Chang aaf3e14dd6 merge 2024-06-06 16:24:58 +08:00
Xu Chang 9ad9fa262e 修改了account相关的数据结构 2024-06-06 16:23:52 +08:00
lxy 99d2876ae8 build 2024-06-06 16:10:22 +08:00
lxy 0365869587 pay attrUpdateMatrix 更新 2024-06-06 16:09:54 +08:00
lxy 23349d11df wpProduct拆分为两个文件 2024-06-06 16:08:33 +08:00
lxy 09e0e49b51 build 2024-06-06 10:45:32 +08:00
Xu Chang 60584419f8 merge dev 2024-06-05 16:27:47 +08:00
Xu Chang 23d7134152 微信支付相关设置对象的管理 2024-06-03 23:52:59 +08:00
Xu Chang 7d70d795f7 一些新的pay逻辑 2024-06-02 18:48:20 +08:00
lxy 93f7b1b93b 线下支付支付成功更新paid 2024-06-02 18:21:36 +08:00
lxy f41d0d66f7 Merge branch 'dev' of gitea.51mars.com:Oak-Team/oak-pay-business into dev 2024-05-31 16:56:31 +08:00
lxy 4778b4d3f6 提现相关页面mp 2024-05-31 16:56:26 +08:00
Xu Chang 78a07b2097 pay的小提交 2024-05-31 15:38:58 +08:00
Xu Chang 962298ea98 修改了Account类型的支付逻辑,支持多次支付 2024-05-31 15:27:21 +08:00
Xu Chang 507c43d87f 提现中的各种细节和逻辑 2024-05-30 13:21:28 +08:00
Xu Chang 5b5a7f1b70 退款的逻辑和界面 2024-05-29 21:05:10 +08:00
Xu Chang 3908215be5 withdraw的一堆实现 2024-05-28 12:35:52 +08:00
Xu Chang 59ac70ee25 修改了一些样式 2024-05-27 15:22:34 +08:00
Xu Chang e1491186a9 refund相关的数据结构,以及withdrawChannel的配置界面 2024-05-27 15:15:23 +08:00
Xu Chang 3dc89a9c74 withdraw相关数据结构的设计 2024-05-26 12:52:33 +08:00
Xu Chang 59e5408114 增加了refund中的creator,增加了一些actionPath 2024-05-26 12:04:17 +08:00
Xu Chang 8c0e4f437c 增加了一些关于refund的数据结构和逻辑 2024-05-24 18:40:56 +08:00
Xu Chang d503341ffb account/deposit的笔误 2024-05-23 01:17:47 +08:00
Xu Chang b7249a0ade account/deposit处理了自动计算损耗的逻辑 2024-05-22 18:45:36 +08:00
Xu Chang 88d5b7bcdf 处理了充值的最大值限制 2024-05-22 13:57:00 +08:00
Xu Chang 534f13b058 Merge branch 'dev' of gitea.51mars.com:Oak-Team/oak-pay-business into dev 2024-05-21 19:52:30 +08:00
Xu Chang 5781d17c81 paydetail页面调整,公众号环境支付测试通过 2024-05-21 19:52:25 +08:00
lxy d529be67d1 paylist 排序修改 2024-05-21 17:23:00 +08:00
Xu Chang 3ec7fe4b93 实现了wechat_js类型的支付(未测试) 2024-05-21 13:35:36 +08:00
Xu Chang 73abb9419e 给account充值时扣掉相应的损耗 2024-05-19 17:17:51 +08:00
Xu Chang 0452c0a265 pay的attrUpdateMatrix写错了 2024-05-18 20:21:52 +08:00
Xu Chang 392059c471 wechatPay的小问题 2024-05-18 20:10:25 +08:00
Xu Chang 07c321960b build 2024-05-18 19:17:45 +08:00
Xu Chang 12f9a83c96 修正了payConfig/upsert逻辑,修正了pay/detail的支付逻辑 2024-05-18 19:15:57 +08:00
Xu Chang c65e8c2f1d wechatPay的实现 2024-05-18 13:44:06 +08:00
Xu Chang 022570d700 1.0.6-pub 2024-05-17 16:31:55 +08:00
Xu Chang 2dd04c7cef 支付配置中增加了充值扣款比例 2024-05-17 15:54:00 +08:00
Xu Chang 65db56ea74 account/deposit的样式 2024-05-17 15:02:24 +08:00
Xu Chang 4e7da95284 account/deposit的一些细节 2024-05-17 13:55:48 +08:00
Xu Chang 54b827447b account/deposit的一些小问题 2024-05-17 12:31:09 +08:00
Xu Chang 16e0d98775 exception的处理边界 2024-05-17 10:09:05 +08:00
Xu Chang fdc0f0dbdf 还是deposit的小bug 2024-05-16 22:03:11 +08:00
Xu Chang 3b5fd00175 depsit中的小bug 2024-05-16 21:55:51 +08:00
Xu Chang a9c04496ae 修正了pay的若干错误逻辑 2024-05-14 21:02:16 +08:00
Xu Chang 150e5f530b order/pay的实现 2024-05-14 19:44:43 +08:00
Xu Chang fdd12e126d 完善了payDetail 2024-05-12 23:45:34 +08:00
Xu Chang 0e674ea63d payDetail 2024-05-12 18:23:18 +08:00
lxy 431a3ce536 pay list 组件filter使用system 2024-05-10 19:45:00 +08:00
Xu Chang 5c51f17f66 account充值逻辑上的一些页面修订和小程序实现 2024-05-10 15:11:29 +08:00
Xu Chang 8c3fa8ee21 小程序的一些开发 2024-05-10 09:26:11 +08:00
Xu Chang 1f476f6938 几个小bug 2024-05-09 19:11:31 +08:00
Xu Chang 7082a521cb 增加了pay的attrUpdateMatrix 2024-05-09 12:11:51 +08:00
Xu Chang fe8caf3da5 完善了N多pay的逻辑和component 2024-05-07 21:32:39 +08:00
Xu Chang 68983bd5eb 大量页面实现 2024-05-05 12:17:37 +08:00
Xu Chang ca2a7cbdfe 一堆更新 2024-05-03 21:58:44 +08:00
Xu Chang 3c2e1a961f pay-detail增加了对wechatpay-native的渲染处理 2024-04-30 12:27:56 +08:00
Xu Chang 821c73beb5 wechatPay.fontend的部分调试 2024-04-30 12:24:19 +08:00
Xu Chang 0349a75791 实现了account充值的主要逻辑 2024-04-27 18:12:22 +08:00
Xu Chang f9166d1c9c 编写了大量支付相关的逻辑 2024-04-26 20:58:30 +08:00
Xu Chang 288426babb 大量逻辑代码 2024-04-25 20:07:31 +08:00