liu
|
3f36c2c93c
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# app/common/logic/PayNotifyLogic.php
|
2024-06-11 11:12:54 +08:00 |
|
liu
|
f8fb07e482
|
修改订单缺失参数,回调逻辑修改
|
2024-06-11 11:11:44 +08:00 |
|
|
|
71ebcb10db
|
feat: 修改支付回调处理逻辑和订单入账规则
|
2024-06-11 10:22:13 +08:00 |
|
|
|
cf118c81ff
|
feat(OrderLogic, UserLogic, PayNotifyLogic, PushDeliverySend): 修改订单与用户逻辑，支持新支付方式与库存计算，优化小程序通知
|
2024-06-10 09:11:59 +08:00 |
|
|
|
1ea3a0ab14
|
feat(OrderLogic, CapitalFlowLogic): 重构余额支付逻辑，优化库存计算与用户余额处理
|
2024-06-09 20:14:21 +08:00 |
|
|
|
2d1cb8f485
|
refactor(OrderLogic, StoreOrderLogic): 修改订单与门店订单逻辑，更新配送方式默认值为门店自提
|
2024-06-09 19:54:05 +08:00 |
|
|
|
a329c7ef5b
|
feat(OrderLogic, CartLogic): 重构订单与购物车逻辑，支持新活动状态与库存计算
|
2024-06-09 18:12:00 +08:00 |
|
|
|
dac95c1e0c
|
feat(ProductLists): 修改商品列表逻辑，支持不同门店商品展示与自提
|
2024-06-09 14:42:59 +08:00 |
|
|
|
e6405cd648
|
refactor(PayNotifyLogic): 优化支付回调处理逻辑，提高代码可读性
|
2024-06-08 22:06:30 +08:00 |
|
|
|
6ba088cbda
|
feat(order): 修改订单支付逻辑与地址获取方式
|
2024-06-08 20:47:30 +08:00 |
|
|
|
68336add58
|
feat: 修改StoreOrderLogic以使用真实订单ID
|
2024-06-08 20:00:22 +08:00 |
|
|
|
73ff0a9ae8
|
feat: 修改订单逻辑以处理购物车商品
|
2024-06-08 19:56:02 +08:00 |
|
|
|
6dbd3b328b
|
Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
|
2024-06-08 18:14:16 +08:00 |
|
|
|
3618a0bfee
|
feat: 增加微信支付回调处理逻辑
|
2024-06-08 18:14:11 +08:00 |
|
liu
|
98c464048f
|
Merge remote-tracking branch 'origin/main'
|
2024-06-08 18:04:48 +08:00 |
|
liu
|
da297380fc
|
回调日志
|
2024-06-08 18:04:40 +08:00 |
|
|
|
601aa01ab8
|
Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
|
2024-06-08 17:37:23 +08:00 |
|
|
|
7febb80b9d
|
feat: 修改了订单处理的逻辑，引入了核销码功能，并优化了支付通知的推送机制。
|
2024-06-08 17:37:18 +08:00 |
|
liu
|
4e9e6d0410
|
回调日志
|
2024-06-08 17:02:05 +08:00 |
|
|
|
50e415ae2d
|
Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
# Conflicts:
# app/common/logic/store_order/StoreOrderLogic.php
|
2024-06-08 16:53:43 +08:00 |
|
|
|
3b03ecfa63
|
添加商品统计、用户统计
|
2024-06-08 16:53:08 +08:00 |
|
|
|
9255bda969
|
Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
|
2024-06-08 15:20:00 +08:00 |
|
|
|
ee66715667
|
feat(StoreOrderLogic): 修改折扣率计算方式及退款方式
|
2024-06-08 15:19:56 +08:00 |
|
liu
|
ac775b0b68
|
退款相关基础代码,和预约时间
|
2024-06-08 14:17:44 +08:00 |
|
|
|
d26d9c97d4
|
Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
|
2024-06-08 13:41:47 +08:00 |
|
|
|
63df5d184c
|
feat(store_order): 添加了店铺ID和员工ID到购物车逻辑
|
2024-06-08 13:41:44 +08:00 |
|
|
|
4c02524641
|
Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
|
2024-06-08 13:37:19 +08:00 |
|
|
|
297bccb3a4
|
Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
# Conflicts:
# app/common/logic/store_order/StoreOrderLogic.php
|
2024-06-08 13:36:55 +08:00 |
|
|
|
2c224fa60a
|
Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
|
2024-06-08 13:34:49 +08:00 |
|
|
|
20640a2b84
|
feat: 添加购物车功能，包括添加、修改、删除购物车商品，以及购物车列表展示
feat: 购物车商品数量限制为100个，超出时无法添加更多商品
fix: 修复订单创建时支付方式验证错误
refactor: 重构订单创建逻辑，优化代码结构
style: 修改金额计算方式，保留两位小数
test: 增加购物车列表接口测试用例
docs: 更新购物车相关接口文档
build: 更新依赖包版本
|
2024-06-08 13:33:17 +08:00 |
|
|
|
7f774816dc
|
修改订单统计
|
2024-06-08 12:02:08 +08:00 |
|
liu
|
8299b9b428
|
退款
|
2024-06-08 09:59:25 +08:00 |
|
|
|
128ad0cc1e
|
修改订单列表查询
|
2024-06-07 17:28:02 +08:00 |
|
liu
|
2627df98eb
|
活动开启下单后更新用户的等级
|
2024-06-06 17:04:34 +08:00 |
|
|
|
64f59e596e
|
修改店员详情、配送员详情
|
2024-06-06 17:02:53 +08:00 |
|
|
|
4362d43795
|
Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
|
2024-06-06 16:45:20 +08:00 |
|
|
|
359c015a15
|
添加配送员管理
|
2024-06-06 16:45:14 +08:00 |
|
liu
|
f591acf7ca
|
修改充值
|
2024-06-06 16:12:42 +08:00 |
|
|
|
8515960d83
|
添加店员管理
|
2024-06-06 15:00:33 +08:00 |
|
|
|
98fb4d087c
|
添加现金支付记录
|
2024-06-06 11:02:56 +08:00 |
|
liu
|
bae7a58f0e
|
回调加入资金流水
|
2024-06-06 10:59:27 +08:00 |
|
|
|
496f20252a
|
修改订单统计查询
|
2024-06-06 10:31:54 +08:00 |
|
|
|
4ef8bf0097
|
添加财务流水备注
|
2024-06-06 09:44:53 +08:00 |
|
liu
|
750f54b453
|
等级和调用支付
|
2024-06-05 18:44:18 +08:00 |
|
liu
|
cf4fc46757
|
Merge remote-tracking branch 'origin/main'
|
2024-06-05 18:39:21 +08:00 |
|
liu
|
9a9c836f34
|
等级和调用支付
|
2024-06-05 18:39:11 +08:00 |
|
|
|
be1e3067ec
|
修改财务流水写入
|
2024-06-05 18:07:34 +08:00 |
|
liu
|
8d86497593
|
Merge remote-tracking branch 'origin/main'
|
2024-06-05 17:43:47 +08:00 |
|
liu
|
e15161a2d4
|
财务流水兼容
|
2024-06-05 17:43:38 +08:00 |
|
|
|
2cb062c39b
|
添加退款订单
|
2024-06-05 17:03:48 +08:00 |
|
