Commit Graph

557 Commits

Author SHA1 Message Date
Xu Chang c8e4b9c82c 一个低级bug 2025-03-05 16:29:05 +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
Xu Chang 5baa3aab5f Merge branch 'ship' of gitea.51mars.com:Oak-Team/oak-pay-business into ship 2025-02-26 10:04:48 +08:00
Xu Chang 3b1a3b8d90 ship相关的一些定义 2025-02-26 10:04:42 +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 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 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
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