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

1775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mkm
7a8bf9f5c6 Merge pull request 'feat(PayNotifyLogic): 修改收银台支付逻辑，移除订单状态设置' (#191) from dev into main 
Reviewed-on: #191
 2024-09-05 22:21:48 +08:00
mkm
73565cace9 feat(PayNotifyLogic): 修改收银台支付逻辑，移除订单状态设置 2024-09-05 22:21:06 +08:00
mkm
fa8421b6e7 Merge pull request 'refactor(WorkbenchLogic): 调整支付订单查询逻辑，优化支付订单处理效率' (#190) from dev into main 
Reviewed-on: #190
 2024-09-05 22:13:38 +08:00
mkm
8e9e2b8ded refactor(WorkbenchLogic): 调整支付订单查询逻辑，优化支付订单处理效率 2024-09-05 22:13:14 +08:00
mkm
101a388384 Merge pull request 'refactor(StoreProductLists, WorkbenchLogic): 调整商品查询逻辑及订单支付查询，优化库存及订单处理' (#189) from dev into main 
Reviewed-on: #189
 2024-09-05 22:03:36 +08:00
mkm
869faf2f44 refactor(StoreProductLists, WorkbenchLogic): 调整商品查询逻辑及订单支付查询，优化库存及订单处理 2024-09-05 21:57:12 +08:00
mkm
789d16f9ba Merge pull request 'dev' (#188) from dev into main 
Reviewed-on: #188
 2024-09-05 16:13:45 +08:00
mkm
9b6bf999c0 feat(warehouse_order): 根据仓库订单调整商品查询逻辑 2024-09-05 16:10:59 +08:00
mkm
c57c73b40e feat: 添加商品ID列到Excel导出字段 2024-09-05 11:37:01 +08:00
mkm
1fbc0b6cee feat: 添加订单状态保存功能 2024-09-05 10:31:29 +08:00
mkm
c2a617aca8 feat(CapitalFlowLogic, CommissionProductLogic): 新增/修改逻辑以处理订单支付/退款及商品佣金计算 2024-09-03 22:53:26 +08:00
mkm
cbeb06426d feat: 添加批发商品列表功能 2024-09-03 17:55:14 +08:00
mkm
dfeb44be86 Merge pull request 'feat: 修改了StoreProductLists.php文件，调整了商品列表的查询字段，添加了'store_info'字段，并更新了相应的字典翻译。' (#187) from dev into main 
Reviewed-on: #187
1.1.1 		2024-09-03 17:17:42 +08:00
mkm
60c7b154a5 feat: 修改了StoreProductLists.php文件，调整了商品列表的查询字段，添加了'store_info'字段，并更新了相应的字典翻译。 2024-09-03 17:17:21 +08:00
mkm
7a655ceb8f Merge pull request 'feat: 修改订单逻辑以查询分店产品' (#186) from dev into main 
Reviewed-on: #186
 2024-09-03 15:59:21 +08:00
mkm
b0a6d7da50 feat: 修改订单逻辑以查询分店产品 2024-09-03 15:58:55 +08:00