|
|
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 |
|
|
|
d1c52d222a
|
修改订单详情
|
2024-06-05 15:49:43 +08:00 |
|
|
|
a3e73c3e37
|
修改订单列表
|
2024-06-05 15:20:58 +08:00 |
|
liu
|
01f4d97494
|
充值
|
2024-06-05 13:37:25 +08:00 |
|
liu
|
cf384e724e
|
支付回调
|
2024-06-05 12:45:14 +08:00 |
|
|
|
d4b3352a5f
|
feat(PaymentLogic): 异常信息增加日志记录
|
2024-06-05 09:46:28 +08:00 |
|
|
|
aba84bb920
|
feat(PaymentLogic): 简化支付逻辑，移除多余的异常处理
|
2024-06-05 09:45:51 +08:00 |
|
liuchaofu
|
b61a99b060
|
订单核销修改
|
2024-06-04 22:20:47 +08:00 |
|
liu
|
74b8a116e8
|
支付调试
|
2024-06-04 18:44:32 +08:00 |
|
liu
|
0ea8694547
|
打印
|
2024-06-04 18:37:37 +08:00 |
|
liu
|
19cf43e8b6
|
1
|
2024-06-04 18:31:11 +08:00 |
|
liu
|
08794dd9d8
|
捕获错误
|
2024-06-04 18:16:03 +08:00 |
|
|
|
e4bf72dc58
|
修改余额支付
|
2024-06-04 17:33:11 +08:00 |
|
|
|
e4c6c74f1a
|
修改余额支付
|
2024-06-04 17:21:57 +08:00 |
|
|
|
14bc0c1539
|
Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
# Conflicts:
# app/api/controller/order/OrderController.php
# app/api/logic/order/OrderLogic.php
|
2024-06-04 16:56:43 +08:00 |
|
|
|
cc0e9a3a24
|
修改订单校验、下单、支付
|
2024-06-04 16:51:26 +08:00 |
|
liu
|
96fcaf5021
|
登录和支付
|
2024-06-04 15:26:45 +08:00 |
|
|
|
0298e42057
|
调整订单核销
|
2024-06-04 15:21:14 +08:00 |
|
|
|
34cad62c8e
|
添加财务流水、支付回调、资金流水
|
2024-06-04 14:15:08 +08:00 |
|
|
|
e543fc4f52
|
feat(financial_record): 更新财务流水模型及支付通知逻辑
|
2024-06-04 09:24:27 +08:00 |
|
|
|
5d24bbe2a0
|
feat(PayController): 修改支付控制器以处理微信通用回调
|
2024-06-03 16:09:06 +08:00 |
|
|
|
d49f9438b7
|
feat: 修改IndexController类以创建订单，并移除Cart模型的主键和表名
|
2024-06-03 15:31:36 +08:00 |
|
liu
|
88468aef3f
|
迁移整合代码(订单,下单相关)
|
2024-06-03 11:25:05 +08:00 |
|
