mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,891 Commits 15 Branches 15 Tags
Commit Graph

1891 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mkm
f2224ebe3d Merge pull request 'feat(process/Task.php): 修改订单删除逻辑及定时任务' (#212) from dev into main 
Reviewed-on: #212
 2024-09-18 11:16:19 +08:00
mkm
80bf6eaf4f feat(process/Task.php): 修改订单删除逻辑及定时任务 2024-09-18 11:13:38 +08:00
mkm
24cdf6a892 Merge pull request 'feat(StoreProductLogic): updated logic for product type 5, added sales condition, improved code quality' (#210) from dev into main 
Reviewed-on: #210
 2024-09-17 10:21:00 +08:00
mkm
19be49f0d5 feat(StoreProductLogic): updated logic for product type 5, added sales condition, improved code quality 2024-09-17 10:20:43 +08:00
mkm
ab06ae6b32 Merge pull request 'feat(ProductController, ProductLists): updated logic for product lists, added access control, fixed bugs, improved code quality' (#209) from dev into main 
Reviewed-on: #209
 2024-09-17 10:01:06 +08:00
mkm
c1a107886d feat(ProductController, ProductLists): updated logic for product lists, added access control, fixed bugs, improved code quality 2024-09-17 10:00:39 +08:00
mkm
7034a24cf0 Merge pull request 'feat(StoreOrderCartInfoLists): 更新了'门店'字段的逗号错误' (#208) from dev into main 
Reviewed-on: #208
 2024-09-17 09:39:48 +08:00
mkm
c47825e2a2 feat(StoreOrderCartInfoLists): 更新了'门店'字段的逗号错误 2024-09-17 09:39:21 +08:00
mkm
a8184c4ca5 Merge pull request 'feat(OrderController, StoreOrderController): updated logic for gift funds payment, fixed bugs, improved code quality' (#207) from dev into main 
Reviewed-on: #207
 2024-09-17 08:54:45 +08:00
mkm
908092f39d feat(OrderController, StoreOrderController): updated logic for gift funds payment, fixed bugs, improved code quality 2024-09-17 08:53:09 +08:00
mkm
7a8cea4265 Merge pull request 'feat(OrderLogic): updated logic for orders, fixed bugs, improved code quality' (#206) from dev into main 
Reviewed-on: #206
 2024-09-17 08:30:53 +08:00
mkm
e5c0752280 feat(OrderLogic): updated logic for orders, fixed bugs, improved code quality 2024-09-17 08:30:20 +08:00
mkm
2ae5b60bc4 Merge pull request 'feat(StoreOrderLists, StoreProductLists, OrderLogic): updated logic for orders, fixed bugs, improved code quality' (#205) from dev into main 
Reviewed-on: #205
 2024-09-16 22:05:42 +08:00
mkm
c45ae4e1a1 feat(StoreOrderLists, StoreProductLists, OrderLogic): updated logic for orders, fixed bugs, improved code quality 2024-09-16 22:02:19 +08:00
mkm
fb9937d389 Merge pull request 'feat: 添加is_lack字段到ProductLists' (#204) from dev into main 
Reviewed-on: #204
 2024-09-13 22:12:18 +08:00
mkm
765e08fe9a feat: 添加is_lack字段到ProductLists 2024-09-13 16:27:30 +08:00
mkm
16cf1303e6 Merge pull request 'feat(SystemStoreMenu): 添加软删除功能' (#203) from dev into main 
Reviewed-on: #203
 2024-09-13 14:01:18 +08:00
mkm
f480e8aee7 feat(SystemStoreMenu): 添加软删除功能 2024-09-13 13:58:39 +08:00
mkm
26ee275a67 Merge pull request 'feat(StoreOrderLists): 添加了退款价格字段查询' (#202) from dev into main 
Reviewed-on: #202
 2024-09-13 11:47:47 +08:00
mkm
ca58281282 feat(StoreOrderLists): 添加了退款价格字段查询 2024-09-13 11:47:14 +08:00
mkm
206a8509a6 Merge pull request 'dev' (#201) from dev into main 
Reviewed-on: #201
 2024-09-13 09:30:02 +08:00
mkm
4fd112b900 feat: 添加对店铺配置的校验功能 2024-09-13 09:22:20 +08:00
mkm
1648d48c15 feat: 添加订单商品、编辑订单商品和删除订单商品的功能 2024-09-12 17:25:09 +08:00
mkm
6c8caccbad Merge pull request 'dev' (#200) from dev into main 
Reviewed-on: #200
 2024-09-11 21:49:19 +08:00
mkm
bbbed26fbf feat(StoreOrderLists, UserRechargeLists, OrderLogic): updated lists, logic for orders & refunds, fixed bugs, improved code quality 2024-09-11 21:47:14 +08:00
mkm
40cc604461 feat: 更新用户积分逻辑 2024-09-11 17:58:23 +08:00
mkm
6b0d5e3edb feat: 修改库存计算方式以增加库存总量的显示 2024-09-11 17:10:15 +08:00
mkm
20095c8085 feat: 修改了商品订单逻辑和佣金计算逻辑 2024-09-11 15:15:07 +08:00
mkm
f47afdd7b1 Merge pull request 'dev' (#199) from dev into main 
Reviewed-on: #199
 2024-09-09 23:15:24 +08:00
mkm
be8881b1ad feat(StoreProductLists): 修改了商品列表的显示方式 2024-09-09 17:57:33 +08:00
mkm
b65ab15e2a feat: 修改了商品列表搜索功能 2024-09-09 17:57:03 +08:00
mkm
0214b50ca8 feat: 修改了商品列表的查询字段和计算方式，并新增了商品的计价方式、自编码、供应商名称等字段； 
fix: 修复了订单退款状态未更新的问题；
refactor: 重构了佣金计算逻辑，调整了部分字段的命名；
style: 调整了代码格式，如空格、分号等；
test: 添加了相关测试；
docs: 更新了相关文档；
build: 更新了依赖；
ops: 更新了部署脚本；
chore: 更新了项目配置文件。
 2024-09-09 17:47:08 +08:00
mkm
7da078bc12 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-09-07 18:08:05 +08:00
mkm
e7687a25a5 feat: 修正商品和订单金额计算逻辑 2024-09-07 18:07:58 +08:00
mkm
e11eb47227 Merge pull request 'feat(ProductLists): 修改商品排序规则，调整'sort'优先级，优化商品排序功能' (#198) from dev into main 
Reviewed-on: #198
1.1.2 		2024-09-07 00:04:15 +08:00
mkm
e0713be0a0 feat(ProductLists): 修改商品排序规则，调整'sort'优先级，优化商品排序功能 2024-09-07 00:03:49 +08:00
mkm
d3c39fff7c Merge pull request 'dev' (#197) from dev into main 
Reviewed-on: #197
 2024-09-06 23:59:29 +08:00
mkm
27e4295df5 feat(ProductLists): 修改商品列表排序规则，增加'sort'参数，优化商品排序功能 2024-09-06 23:57:57 +08:00
mkm
663defd80d feat: 修改了StoreProductLists.php文件，修复了库存计算的bug，现在库存计算更加准确。 2024-09-06 17:57:26 +08:00
mkm
6e0a9e73f1 feat(warehouse_product): 添加仓库产品结算功能 2024-09-06 17:53:43 +08:00
mkm
23fc1e3230 Merge pull request 'feat: 添加了商品信息空值处理' (#196) from dev into main 
Reviewed-on: #196
 2024-09-06 14:13:21 +08:00
mkm
1dca91528d feat: 添加了商品信息空值处理 2024-09-06 14:12:56 +08:00
mkm
1617b0aa35 Merge pull request 'fix(StoreProductLogic): 修复了商品价格更新时的错误 store_id 条件' (#195) from dev into main 
Reviewed-on: #195
 2024-09-06 14:10:35 +08:00
mkm
2cbe0fc8a3 fix(StoreProductLogic): 修复了商品价格更新时的错误 store_id 条件 2024-09-06 14:05:33 +08:00
mkm
622f5bf013 Merge pull request 'feat(store_order): 新增判断店铺ID来查询分支商品功能' (#194) from dev into main 
Reviewed-on: #194
 2024-09-06 13:46:56 +08:00
mkm
816521c6be feat(store_order): 新增判断店铺ID来查询分支商品功能 2024-09-06 13:46:27 +08:00
mkm
0436ad004d Merge pull request 'feat: 添加商品ID到Excel字段列表' (#193) from dev into main 
Reviewed-on: #193
 2024-09-06 11:33:27 +08:00
mkm
473b276e55 feat: 添加商品ID到Excel字段列表 2024-09-06 11:32:30 +08:00
mkm
b7a1501539 Merge pull request 'feat(OrderLogic): 修改生鲜产品订单金额限制逻辑' (#192) from dev into main 
Reviewed-on: #192
 2024-09-06 10:07:03 +08:00
mkm
ea4bd28a0e feat(OrderLogic): 修改生鲜产品订单金额限制逻辑 2024-09-06 10:06:38 +08:00