|
|
3b03ecfa63
|
添加商品统计、用户统计
|
2024-06-08 16:53:08 +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 |
|
|
|
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
|
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 |
|
liu
|
06bdfacbe5
|
取消售后
|
2024-06-08 09:43:24 +08:00 |
|
|
|
128ad0cc1e
|
修改订单列表查询
|
2024-06-07 17:28:02 +08:00 |
|
|
|
a4ae19a64a
|
调整账单导出
|
2024-06-07 14:22:28 +08:00 |
|
|
|
d0bbd71dde
|
修改账单统计
|
2024-06-07 11:27:08 +08:00 |
|
|
|
99cdb5e150
|
添加财务账单列表
|
2024-06-07 10:05:28 +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 |
|
|
|
56b7588e54
|
feat: 添加获取退款订单列表API
|
2024-06-06 14:38:11 +08:00 |
|
|
|
98fb4d087c
|
添加现金支付记录
|
2024-06-06 11:02:56 +08:00 |
|
liu
|
bae7a58f0e
|
回调加入资金流水
|
2024-06-06 10:59:27 +08:00 |
|
|
|
ec71741e53
|
feat: 订单列表添加产品店铺信息展示
|
2024-06-06 10:33:58 +08:00 |
|
|
|
496f20252a
|
修改订单统计查询
|
2024-06-06 10:31:54 +08:00 |
|
|
|
4ef8bf0097
|
添加财务流水备注
|
2024-06-06 09:44:53 +08:00 |
|
liuchaofu
|
07103bbf65
|
会员等级
|
2024-06-05 23:00:13 +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 |
|
|
|
4d4467547a
|
Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
|
2024-06-05 17:46:56 +08:00 |
|
|
|
1407beb266
|
修改订单列表查询
|
2024-06-05 17:46:42 +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 |
|
liu
|
a648821407
|
加上会员等级扣费
|
2024-06-05 16:18:25 +08:00 |
|
|
|
d1c52d222a
|
修改订单详情
|
2024-06-05 15:49:43 +08:00 |
|
|
|
337873c199
|
Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
|
2024-06-05 15:21:03 +08:00 |
|
|
|
a3e73c3e37
|
修改订单列表
|
2024-06-05 15:20:58 +08:00 |
|
liu
|
5b9c50b689
|
访问
|
2024-06-05 14:54:25 +08:00 |
|
|
|
de3d6658d8
|
Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
|
2024-06-05 14:28:02 +08:00 |
|
