lxy
|
6da03d5698
|
获取projection时去除wpProduct上的shipping
|
2025-02-24 10:30:39 +08:00 |
 Xu Chang
|
2b4a60be99
|
Merge branch 'ship' of gitea.51mars.com:Oak-Team/oak-pay-business into ship
|
2025-02-21 21:41:52 +08:00 |
|
Xu Chang
|
9195d6353d
|
调整了shipAccount相关的数据结构，增加了wechatMpShip对象的配置组件
|
2025-02-21 21:41:48 +08:00 |
|
lxy
|
1be08c6d4f
|
当生成accountOper时，修改account中的值，并向订阅者推送 trigger添加asRoot
|
2025-02-21 11:33:14 +08:00 |
|
Xu Chang
|
f3d4abb911
|
去掉了许多废弃的组件的设置，增加了ship相关的基础对象定义
|
2025-02-19 11:35:35 +08:00 |
|
Xu Chang
|
26b1cc4a48
|
调整了一些属性命名和逻辑
|
2025-02-18 18:31:04 +08:00 |
|
Xu Chang
|
deba012c3f
|
order增加了货品发送动作到receivingMethod的限制
|
2025-02-18 12:15:51 +08:00 |
|
Xu Chang
|
acb6746733
|
调整了order和pay中的部分属性
|
2025-02-17 16:47:12 +08:00 |
|
lxy
|
e2be5c11fc
|
pay实体增加autoStart决定是否自动开始支付
|
2025-02-13 17:36:33 +08:00 |
|
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 |
|
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 |