|
|
d01debfc77
|
Merge pull request 'dev' (#541) from dev into main
Reviewed-on: #541
|
2025-03-06 11:23:19 +08:00 |
|
|
|
8ef42fc024
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2025-03-06 11:20:09 +08:00 |
|
|
|
22ba0f70db
|
修改预订单录入的错误
|
2025-03-06 11:20:04 +08:00 |
|
|
|
c5733df38f
|
Merge pull request 'refactor(admin): 重构前置订单中的会员价格获取逻辑' (#540) from dev into main
Reviewed-on: #540
|
2025-03-05 17:45:31 +08:00 |
|
|
|
3060fa4323
|
refactor(admin): 重构前置订单中的会员价格获取逻辑
- 注释掉了原有的根据用户分组获取产品价格的代码
- 修改为直接从 StoreProduct 模型中获取产品的 vip_price 字段
- 使用 withTrashed() 方法以包含软删除的产品
- 优化了代码结构，提高了代码的可读性和维护性
|
2025-03-05 17:44:21 +08:00 |
|
|
|
f07e3ab207
|
Merge pull request '修改门店商品列表导出字段' (#539) from dev into main
Reviewed-on: #539
|
2025-03-04 15:05:21 +08:00 |
|
|
|
a3e1660e45
|
修改门店商品列表导出字段
|
2025-03-04 11:43:41 +08:00 |
|
|
|
6ae8cc3011
|
Merge pull request 'dev' (#538) from dev into main
Reviewed-on: #538
|
2025-03-03 15:14:49 +08:00 |
|
|
|
c9e57c85b8
|
fix(store_product): 修复商品恢复功能
- 在恢复商品时，使用 withTrashed() 方法确保软删除的商品也能被更新
- 这个修改确保了商品及其关联的分店商品记录都能正确地恢复
|
2025-03-03 15:12:49 +08:00 |
|
|
|
8a8c7116fa
|
修改支付队列
|
2025-03-03 11:07:07 +08:00 |
|
|
|
73dcd5d130
|
Merge pull request 'feat(warehouse): 仓库列表增加订单类型字段' (#537) from dev into main
Reviewed-on: #537
|
2025-03-01 10:45:07 +08:00 |
|
|
|
65f65afc50
|
feat(warehouse): 仓库列表增加订单类型字段
- 在仓库产品列表中添加订单类型名称字段
- 初始化订单类型名称为空字符串
- 在列表显示中添加订单类型列
|
2025-03-01 10:44:26 +08:00 |
|
|
|
7b153c2a0f
|
Merge pull request '修改用户会员价' (#536) from dev into main
Reviewed-on: #536
|
2025-02-25 12:06:12 +08:00 |
|
|
|
c37634af7d
|
修改用户会员价
|
2025-02-25 12:05:57 +08:00 |
|
|
|
090ef53143
|
Merge pull request '修改用户会员价' (#535) from dev into main
Reviewed-on: #535
|
2025-02-25 11:59:47 +08:00 |
|
|
|
2915606dff
|
修改用户会员价
|
2025-02-25 11:59:36 +08:00 |
|
|
|
24ba8d7d6d
|
Merge pull request 'dev' (#534) from dev into main
Reviewed-on: #534
|
2025-02-25 11:56:08 +08:00 |
|
|
|
e829ca6f4e
|
修改用户会员价
|
2025-02-25 11:55:10 +08:00 |
|
|
|
88fb8b504e
|
修改用户会员价
|
2025-02-25 11:50:56 +08:00 |
|
|
|
b95d0f00f8
|
Merge pull request '已删除商品支持恢复' (#533) from dev into main
Reviewed-on: #533
|
2025-02-24 15:51:58 +08:00 |
|
|
|
e2bcde3167
|
已删除商品支持恢复
|
2025-02-24 15:51:35 +08:00 |
|
|
|
f30e0f5c9e
|
Merge pull request '修改商品列表查询' (#532) from dev into main
Reviewed-on: #532
|
2025-02-24 14:40:29 +08:00 |
|
|
|
7bcecaae80
|
修改商品列表查询
|
2025-02-24 11:14:13 +08:00 |
|
|
|
c5ae1e9640
|
Merge pull request '出库列表添加统计查询' (#531) from dev into main
Reviewed-on: #531
|
2025-02-22 11:18:35 +08:00 |
|
|
|
8f09785f30
|
出库列表添加统计查询
|
2025-02-22 11:10:17 +08:00 |
|
|
|
1db6d28560
|
Merge pull request 'dev' (#530) from dev into main
Reviewed-on: #530
|
2025-02-22 10:40:23 +08:00 |
|
|
|
7fd5737c6d
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2025-02-22 10:39:50 +08:00 |
|
|
|
de912712ee
|
修改预订单追加商品
|
2025-02-22 10:39:36 +08:00 |
|
|
|
d9dfa05719
|
Merge pull request 'feat(warehouse): 仓库产品列表添加 VIP 价格字段' (#529) from dev into main
Reviewed-on: #529
|
2025-02-21 17:38:36 +08:00 |
|
|
|
ccc2f3a249
|
feat(warehouse): 仓库产品列表添加 VIP 价格字段
- 在仓库产品列表中添加了 vip_price 字段
- 此修改增加了 VIP 价格信息，便于后续处理和展示
|
2025-02-21 17:38:12 +08:00 |
|
|
|
c020054414
|
Merge pull request 'feat(warehouse): 添加会员价字段' (#528) from dev into main
Reviewed-on: #528
|
2025-02-21 17:36:50 +08:00 |
|
|
|
a8b9081743
|
feat(warehouse): 添加会员价字段
在仓库产品列表中新增了会员价字段，使管理员能够查看会员价格信息。
|
2025-02-21 17:36:22 +08:00 |
|
|
|
a2cd013b07
|
Merge pull request 'refactor(warehousing): 优化入库功能' (#527) from dev into main
Reviewed-on: #527
|
2025-02-21 11:36:19 +08:00 |
|
|
|
da35e7be6a
|
refactor(warehousing): 优化入库功能
- 新增分拣入库功能
- 修改门店入库记录控制器，使用新的仓库产品列表
|
2025-02-21 11:35:51 +08:00 |
|
|
|
1aa6ad89df
|
Merge pull request '修改价格趋势排序' (#526) from dev into main
Reviewed-on: #526
|
2025-02-21 10:03:33 +08:00 |
|
|
|
e3737176e4
|
修改价格趋势排序
|
2025-02-21 10:01:08 +08:00 |
|
|
|
f4460d5dfe
|
Merge pull request 'dev' (#525) from dev into main
Reviewed-on: #525
|
2025-02-21 09:37:41 +08:00 |
|
|
|
928ae0013d
|
修改商品改价
|
2025-02-21 09:37:16 +08:00 |
|
|
|
6a6b142651
|
修改采购商品导入
|
2025-02-20 17:58:36 +08:00 |
|
|
|
6ec2b73721
|
Merge pull request '修改采购商品导入' (#524) from dev into main
Reviewed-on: #524
|
2025-02-20 17:55:37 +08:00 |
|
|
|
9a7951bdf3
|
修改采购商品导入
|
2025-02-20 17:55:14 +08:00 |
|
|
|
fd91afa36d
|
Merge pull request '添加采购商品导入' (#523) from dev into main
Reviewed-on: #523
|
2025-02-20 17:35:37 +08:00 |
|
|
|
ab020238a0
|
添加采购商品导入
|
2025-02-20 17:35:12 +08:00 |
|
|
|
0f6993796c
|
Merge pull request '修改现金流水列表查询' (#522) from dev into main
Reviewed-on: #522
|
2025-02-20 16:00:39 +08:00 |
|
|
|
69cffe9f85
|
修改现金流水列表查询
|
2025-02-20 15:54:49 +08:00 |
|
|
|
66fa4c039a
|
Merge pull request '修改商品价格设置的错误' (#521) from dev into main
Reviewed-on: #521
|
2025-02-20 10:35:17 +08:00 |
|
|
|
ae54e3f26e
|
修改商品价格设置的错误
|
2025-02-20 10:23:10 +08:00 |
|
|
|
6c546ddfc6
|
Merge pull request '修改商品价格设置的错误' (#520) from dev into main
Reviewed-on: #520
|
2025-02-20 10:02:29 +08:00 |
|
|
|
7d149aed99
|
修改商品价格设置的错误
|
2025-02-20 09:59:33 +08:00 |
|
|
|
26cbcace03
|
Merge pull request '修改商品改价的错误' (#519) from dev into main
Reviewed-on: #519
|
2025-02-20 09:22:52 +08:00 |
|
