Commit Graph

436 Commits

Author SHA1 Message Date
Xu Chang c5cd9ac6d1 调整了order/pay的部分逻辑,调了pay/detail组件以适应后台使用的case 2025-02-12 17:38:12 +08:00
Xu Chang bbe3cd17d0 suceedPaying时,如果没有设置successAt则设置为默认 2025-02-12 14:07:32 +08:00
Xu Chang bd6636c4fe 增加了order状态改变时对订阅者的推送 2025-02-12 11:41:53 +08:00
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
lxy 26ce61bc5e data/index添加shipCompany 2025-02-08 18:23:19 +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 157e41d9f4 2.7.1-dev 2025-02-05 14:50:37 +08:00
Xu Chang 3996174282 2.7.0-pub 2025-02-05 14:49:13 +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 658422dadb 添加ship的watchers,同步shipping状态的ship的状态 2025-01-23 17:03:25 +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 98195eed5c build 2025-01-21 15:40:33 +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
Xu Chang c0769f95a1 2.6.3-dev 2025-01-21 15:10:09 +08:00
Xu Chang 1f194f94aa 2.6.2-pub 2025-01-21 15:08:23 +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
Xu Chang f66a4b144c 2.6.2-dev 2025-01-15 14:09:07 +08:00
Xu Chang 8d7561b1b5 2.6.1-pub 2025-01-15 14:07:25 +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 e489f99b2f 线下账户提现转账费率配置允许为0 2025-01-15 10:05:12 +08:00
lxy 6ae47ceed1 同步微信小程序物流公司脚本,生成初始化shipCompany数据 2025-01-14 15:11:13 +08:00
lxy 3a67de24f0 shipCompany实体字段长度增加,添加name上的fulltext类型的索引 2025-01-14 15:10:10 +08:00
lxy 98adc30b27 受发货限制的deposit在pay完成支付后创建ship并调用小程序接口(未测试) 2025-01-13 17:44:29 +08:00
Xu Chang 872729030a 小的引用修正 2025-01-11 21:35:29 +08:00
wkj 48e52a1d76 修正 registerPayClazzEntity判断问题 2025-01-11 20:55:29 +08:00
wkj bb4f0f0823 修正 payConfig组件 key值传入不对 2025-01-10 19:23:34 +08:00
Xu Chang e36244173d 小错误 2025-01-04 09:12:06 +08:00
Xu Chang 093f2e617b 添加了Ship相关的数据结构定义 2025-01-03 17:29:09 +08:00
Xu Chang 9c3220a2dc 增加了小程序支付ship能力带来的变化 2024-12-26 15:52:57 +08:00