Commit Graph

153 Commits

Author SHA1 Message Date
Xu Chang 286a0ecd10 修改了order settlement的检查逻辑 2025-02-11 18:44:40 +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