|
|
6ba088cbda
|
feat(order): 修改订单支付逻辑与地址获取方式
|
2024-06-08 20:47:30 +08:00 |
|
|
|
e6acf8b542
|
feat: 修改订单控制器中的核销码验证、订单支付、退款申请等方法
|
2024-06-08 20:40:28 +08:00 |
|
|
|
9f44216503
|
feat(payment): 修改支付通知处理逻辑
|
2024-06-08 20:11:53 +08:00 |
|
|
|
68336add58
|
feat: 修改StoreOrderLogic以使用真实订单ID
|
2024-06-08 20:00:22 +08:00 |
|
|
|
73ff0a9ae8
|
feat: 修改订单逻辑以处理购物车商品
|
2024-06-08 19:56:02 +08:00 |
|
|
|
5eebccb700
|
feat(store_order): 增加支付功能并修复相关bug
|
2024-06-08 18:47:53 +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
|
2f3e571112
|
创建订单
|
2024-06-08 18:13:58 +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 |
|
|
|
3b4157c242
|
Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
|
2024-06-08 17:38:04 +08:00 |
|
|
|
b9c3413336
|
修改首页配送统计
|
2024-06-08 17:37:59 +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
|
f966f07843
|
取消订单
|
2024-06-08 17:21:55 +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 |
|
liu
|
1450fd2582
|
根据店铺id去返回配送方式
|
2024-06-08 16:35:28 +08:00 |
|
liu
|
606973c928
|
Merge remote-tracking branch 'origin/main'
|
2024-06-08 16:24:51 +08:00 |
|
liu
|
b6aa59e1b8
|
创建订单计算成本和利润
|
2024-06-08 16:24:34 +08:00 |
|
|
|
528f9aff93
|
feat(StoreBranchProductLists): 修改查询条件，优化库存查询
|
2024-06-08 16:01:17 +08:00 |
|
liu
|
8644e3d571
|
列表数据参数修改
|
2024-06-08 15:44:49 +08:00 |
|
liu
|
c721213510
|
退款数量取消
|
2024-06-08 15:42:24 +08:00 |
|
liu
|
d05d73c86c
|
新增访问店铺id
|
2024-06-08 15:37:11 +08:00 |
|
liu
|
92cc14faba
|
折扣价格处理
|
2024-06-08 15:34:14 +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 |
|
|
|
324105c842
|
Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
|
2024-06-08 15:07:50 +08:00 |
|
|
|
a91cf005e3
|
修改订单列表查询
|
2024-06-08 15:07:46 +08:00 |
|
liu
|
b97dd01ab4
|
Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
|
2024-06-08 14:17:57 +08:00 |
|
liu
|
ac775b0b68
|
退款相关基础代码,和预约时间
|
2024-06-08 14:17:44 +08:00 |
|
|
|
0bb1f36e87
|
Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
|
2024-06-08 14:17:11 +08:00 |
|
|
|
7cd251c4ee
|
修改首页订单统计
|
2024-06-08 14:17:05 +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
|
7742312d73
|
退款新加类型
|
2024-06-08 11:07:10 +08:00 |
|
liu
|
e0f8caf64a
|
修改返回数据
|
2024-06-08 10:52:56 +08:00 |
|
liu
|
9299f52210
|
关联查询单位相关
|
2024-06-08 10:42:49 +08:00 |
|
liu
|
6ad936237b
|
取消售后时间
|
2024-06-08 10:34:20 +08:00 |
|
liu
|
5eed480215
|
时间转换
|
2024-06-08 10:30:37 +08:00 |
|
liu
|
ac2c11ba45
|
修改商品列表价格
|
2024-06-08 10:15:17 +08:00 |
|
liu
|
da2f12b219
|
修改活动下创建订单价格为商品的市场价
|
2024-06-08 10:10:00 +08:00 |
|
liu
|
8299b9b428
|
退款
|
2024-06-08 09:59:25 +08:00 |
|
