 Xu Chang
|
74b884d84a
|
调整了order/pay页面的功能
|
2025-02-12 10:41:20 +08:00 |
|
Xu Chang
|
92d1845f88
|
Merge branch 'ship' of gitea.51mars.com:Oak-Team/oak-pay-business into ship
|
2025-02-11 18:44:46 +08:00 |
|
Xu Chang
|
286a0ecd10
|
修改了order settlement的检查逻辑
|
2025-02-11 18:44:40 +08:00 |
lxy
|
b0479c3f90
|
ship trigger修改
|
2025-02-08 18:27:22 +08:00 |
|
Xu Chang
|
7ec5ff8ddf
|
merge dev
|
2025-02-08 09:41:36 +08:00 |
|
Xu Chang
|
6c7b0cbce8
|
build
|
2025-02-08 09:34:09 +08:00 |
|
Xu Chang
|
77cc2fec3b
|
微调了AbstractAccount的定义
|
2025-02-08 09:32:04 +08:00 |
|
Xu Chang
|
7cdd2d152a
|
build
|
2025-02-05 14:43:30 +08:00 |
|
lxy
|
7edea95b78
|
适配general中entities变化
|
2025-02-05 10:41:36 +08:00 |
|
Xu Chang
|
5f37fe3724
|
适配了general的对象改动
|
2025-01-26 16:33:05 +08:00 |
|
lxy
|
9d8cac5193
|
pay trigger误提修正
|
2025-01-23 18:26:10 +08:00 |
|
lxy
|
867dc37001
|
新编译器
|
2025-01-23 17:04:14 +08:00 |
|
lxy
|
3254e9d7ad
|
exception添加module
|
2025-01-21 17:52:27 +08:00 |
|
Xu Chang
|
736c939a2b
|
build
|
2025-01-21 15:43:25 +08:00 |
|
Xu Chang
|
b2cb85ec93
|
exception中定义的关键字何必
|
2025-01-21 15:37:47 +08:00 |
|
Xu Chang
|
de250e4214
|
merge
|
2025-01-21 15:12:27 +08:00 |
wkj
|
98b2be6fb2
|
先注释，新版本有改动
|
2025-01-21 15:00:15 +08:00 |
|
Xu Chang
|
558557a51d
|
exception中变量改了个名字
|
2025-01-21 13:52:50 +08:00 |
|
lxy
|
e6c2b44822
|
添加系统物流公司配置组件
|
2025-01-21 13:39:56 +08:00 |
|
lxy
|
2db3698e3c
|
适配general-business变化
|
2025-01-21 13:39:30 +08:00 |
|
Xu Chang
|
918ab67db1
|
适配了exception的i18n设计
|
2025-01-21 12:53:43 +08:00 |
|
wkj
|
1aa1b19e3f
|
新编译器
|
2025-01-21 12:50:24 +08:00 |
|
Xu Chang
|
3dc3a0bfaf
|
新的编译器
|
2025-01-20 11:29:04 +08:00 |
|
lxy
|
7e86673317
|
修改order分账逻辑，在order全部支付后进行预分账，在order结算时完成分账
|
2025-01-17 19:13:26 +08:00 |
|
lxy
|
509c657057
|
修改AccountOper数据结构，type去除encash、增加preSettle和settle
|
2025-01-17 12:22:46 +08:00 |
|
lxy
|
7abcf86996
|
新增Settlement实体定义，记录订单结算方式
|
2025-01-17 12:03:05 +08:00 |
|
lxy
|
c802b62638
|
适配general-business变化，导出pay自动开始支付trigger
|
2025-01-15 10:45:27 +08:00 |
|
lxy
|
b53e460923
|
去除pay create后自动开始支付的trigger，由业务自行决定
|
2025-01-15 10:16:52 +08:00 |
|
lxy
|
6ae47ceed1
|
同步微信小程序物流公司脚本,生成初始化shipCompany数据
|
2025-01-14 15:11:13 +08:00 |
|
lxy
|
98adc30b27
|
受发货限制的deposit在pay完成支付后创建ship并调用小程序接口(未测试)
|
2025-01-13 17:44:29 +08:00 |
|
wkj
|
48e52a1d76
|
修正 registerPayClazzEntity判断问题
|
2025-01-11 20:55:29 +08:00 |
|
wkj
|
6938821d36
|
1、platform实体增加relation关系
|
2024-12-24 12:09:47 +08:00 |
|
wkj
|
588b16de46
|
build
|
2024-12-04 11:38:05 +08:00 |
|
lxy
|
32d9761f89
|
build
|
2024-11-19 13:44:42 +08:00 |
|
lxy
|
e5248a39b4
|
accountOper type为consume时允许totalPlus为0；修改changeOrderStateByPay方法以支持仅存在一个account的pay且price为0的order支付与退款
|
2024-11-08 19:05:31 +08:00 |
|
wkj
|
241fb97074
|
移除lib下components文件
|
2024-11-06 18:48:15 +08:00 |
|
Xu Chang
|
8b72f2ef21
|
新的编译domain
|
2024-10-21 20:03:56 +08:00 |
|
lxy
|
0ed2b94d65
|
accountOper checker修改,允许消费、提现、退款退还值为0
|
2024-10-17 15:44:37 +08:00 |
|
lxy
|
8635a95791
|
允许将account扣至负值
|
2024-10-15 18:36:25 +08:00 |
|
lxy
|
d9537cc024
|
succeedRefunding方法修改，增加退还至account时创建accountOper
|
2024-09-30 16:53:30 +08:00 |
|
lxy
|
1631d75cfa
|
修改退款相关的trigger
|
2024-09-30 15:52:51 +08:00 |
|
Xu Chang
|
51d0b797a5
|
修改了deposit的退款逻辑,未测试
|
2024-09-29 16:57:27 +08:00 |
|
lxy
|
1d891ac353
|
pay refundable attrUpdateMatrix修改
|
2024-09-27 18:12:50 +08:00 |
|
lxy
|
8b6fe9f062
|
修正entity为system的account 赚取充值损耗
|
2024-09-26 18:45:44 +08:00 |
|
Xu Chang
|
3fcdd62f57
|
适配general的改动
|
2024-09-20 11:39:19 +08:00 |
|
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
|
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
|
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
|
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
|
fc0504f5ba
|
对accountOper结构的修正，2.2.0-pub
|
2024-06-17 18:27:06 +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 |