Commit Graph

436 Commits

Author SHA1 Message Date
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
lxy 966118efee refreshtShipState修改,调用小程序发货信息录入接口trigger修改 2025-03-19 17:12:13 +08:00
lxy a2089585b8 ship添加receive和startReceiving checker 2025-03-19 17:10:46 +08:00
lxy 2cda2b418b getPrintInfo方法修正 2025-03-19 14:47:31 +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
Xu Chang cc4a9f4054 抽象了AbstractPayProduct对象 2025-03-15 11:21:47 +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 bb3fe6cd49 当物流取消时修改相应的order状态trigger修正 2025-03-13 14:56:55 +08:00
Xu Chang 463f58e6f7 Merge branch 'ship' of gitea.51mars.com:Oak-Team/oak-pay-business into ship 2025-03-12 11:18:40 +08:00
Xu Chang a4baeeba49 将WechatMpShipDeubg的getReceiverInfo变为public 2025-03-12 10:11:56 +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 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