lxy
|
0572f4007a
|
当虚拟或受发货限制的自提ship发货后，自动开始确认收货流程
|
2025-03-25 17:04:00 +08:00 |
 Xu Chang
|
b202484712
|
Merge branch 'ship' of gitea.51mars.com:Oak-Team/oak-pay-business into ship
|
2025-03-21 16:58:17 +08:00 |
|
Xu Chang
|
28e17e909e
|
修正了sysAccount/survey组件
|
2025-03-21 16:58:11 +08:00 |
|
lxy
|
8b07d0ab10
|
Merge branch 'ship' of gitea.51mars.com:Oak-Team/oak-pay-business into ship
|
2025-03-21 16:06:15 +08:00 |
|
lxy
|
b062d991ae
|
deposit确认后更新deposit状态
|
2025-03-21 16:06:10 +08:00 |
|
Xu Chang
|
4076fe4d8c
|
更改了一个文字说明
|
2025-03-21 15:34:55 +08:00 |
|
lxy
|
fd0c83236d
|
build
|
2025-03-19 17:13:06 +08:00 |
|
Xu Chang
|
6afc25de0a
|
去掉了order的gState及相关代码
|
2025-03-15 18:51:57 +08:00 |
|
Xu Chang
|
a14e4cda76
|
修正了wpProduct的配置页面
|
2025-03-15 12:26:00 +08:00 |
|
lxy
|
3fbebadd79
|
ship增加action与iState，添加orderstartTaking后创建ship的trigger
|
2025-03-14 19:13:55 +08:00 |
|
lxy
|
b1cab48ca4
|
小程序确认收货提醒
|
2025-03-14 17:16:07 +08:00 |
|
lxy
|
b752c97da1
|
ship实体添加receiveAt
|
2025-03-14 15:24:43 +08:00 |
|
lxy
|
3c8298e08d
|
修改小程序发货信息录入
|
2025-03-14 14:26:27 +08:00 |
|
lxy
|
62021c7721
|
ship添加print动作，增加获取物流面单aspect
|
2025-03-14 12:11:02 +08:00 |
|
lxy
|
6b8f123e63
|
添加定时器 同步快递类型的ship的状态
|
2025-03-13 17:25:12 +08:00 |
|
lxy
|
24b5e28531
|
修改ship变化引起order改变的相关trigger,适配deposit
|
2025-03-13 16:41:54 +08:00 |
|
lxy
|
c8118ec049
|
修改getShipEntity方法获取shipClazz
|
2025-03-13 16:40:51 +08:00 |
|
lxy
|
2692e2d6fc
|
小程序发货信息录入
|
2025-03-13 14:57:49 +08:00 |
|
lxy
|
b9edf59dc7
|
shipClazz中getPrintInfo实现
|
2025-03-12 09:47:12 +08:00 |
|
lxy
|
12fa14c711
|
修改syncState方法
|
2025-03-11 17:24:47 +08:00 |
|
lxy
|
5e87132d27
|
shipClazz/wechatMpShip中syncState、syncPaths方法实现
|
2025-03-11 14:37:23 +08:00 |
|
Xu Chang
|
1c9d3ad826
|
shipClazz的声明加了泛型
|
2025-03-10 14:58:56 +08:00 |
|
Xu Chang
|
87d5f351f5
|
ship的一些checker，去除了多余属性
|
2025-03-08 14:50:02 +08:00 |
|
Xu Chang
|
83963036ab
|
实现了大量和外部物流相关的逻辑
|
2025-03-06 19:23:24 +08:00 |
|
Xu Chang
|
1fe7f220a1
|
对account类型的pay的一些算法改进
|
2025-03-05 20:22:06 +08:00 |
|
Xu Chang
|
22e192d9ba
|
增加了ShipService对象
|
2025-03-05 14:14:24 +08:00 |
|
Xu Chang
|
076f6d53d8
|
微调了一些数据结构
|
2025-03-04 17:07:56 +08:00 |
|
Xu Chang
|
061c0bb2cf
|
删除了shipAccount中默认的bizId
|
2025-03-04 09:22:11 +08:00 |
|
Xu Chang
|
13bd23414d
|
ship增加了个别trigger
|
2025-03-03 19:11:44 +08:00 |
|
Xu Chang
|
dad12657a3
|
Merge branch 'ship' of gitea.51mars.com:Oak-Team/oak-pay-business into ship
|
2025-02-27 15:49:07 +08:00 |
|
Xu Chang
|
fc21d99d94
|
order对是否发货的判定不正确
|
2025-02-27 15:48:51 +08:00 |
|
lxy
|
44c1e1164a
|
order/pay增加了autoStartPay参数
|
2025-02-26 17:51:51 +08:00 |
|
Xu Chang
|
1e35bec400
|
account/detail增加了autoStartPay的参数
|
2025-02-26 17:38:54 +08:00 |
|
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
|
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
|
58f01d86f7
|
payDetail页面增加了一个disableClose的参数
|
2025-02-13 11:56:47 +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
|
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 |
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
|
e489f99b2f
|
线下账户提现转账费率配置允许为0
|
2025-01-15 10:05:12 +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
|
bb4f0f0823
|
修正 payConfig组件 key值传入不对
|
2025-01-10 19:23:34 +08:00 |
|
wkj
|
6938821d36
|
1、platform实体增加relation关系
|
2024-12-24 12:09:47 +08:00 |
|
lxy
|
cef216a873
|
补充oakExecutable判断
|
2024-12-20 18:09:03 +08:00 |
|
lxy
|
711a104c3f
|
oakExecutable适配，使用this.tryExecute()判断
|
2024-12-20 15:38:38 +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 |
|
Xu Chang
|
8b72f2ef21
|
新的编译domain
|
2024-10-21 20:03:56 +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
|
804974782f
|
build
|
2024-09-20 23:54:08 +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 |