|
|
b21bfe7657
|
feat(log): 添加操作日志记录功能
- 新增 ChangeLogLogic 和 ChangeLog 模型用于记录数据变更日志
- 引入 third-party 包 chance-fyi/operation-log 实现日志记录功能
- 在 composer.json 和 config/thinkorm.php 中添加相关配置
|
2025-01-02 11:58:30 +08:00 |
|
|
|
53cb5d8f06
|
Merge branches 'dev' and 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2025-01-01 10:47:24 +08:00 |
|
|
|
99730d82ad
|
refactor(xlsx): 优化多个报表的导出功能
- 新增创建导出目录的逻辑，确保目录存在
- 修改文件保存路径，使用动态创建的目录
- 优化 URL 生成逻辑，使其与实际文件路径一致
- 引入异常处理，当目录创建失败时抛出异常
|
2025-01-01 10:47:19 +08:00 |
|
|
|
2666241796
|
添加定时更新商品价格
|
2024-12-31 17:41:13 +08:00 |
|
|
|
ec78cd4953
|
修改商品分类编辑
|
2024-12-31 16:07:44 +08:00 |
|
|
|
77a1b62bb3
|
修改商品采购价格设置的错误
|
2024-12-31 14:13:35 +08:00 |
|
|
|
733adc5091
|
修改商品采购价格设置的错误
|
2024-12-31 13:35:42 +08:00 |
|
|
|
aee0609d17
|
调整商品分组价格计算
|
2024-12-31 11:29:25 +08:00 |
|
|
|
c2a5ee0fdc
|
调整商品分组价格计算
|
2024-12-30 17:57:27 +08:00 |
|
|
|
844c085df5
|
修改供应商列表，添加商品价格同步
|
2024-12-30 16:31:28 +08:00 |
|
|
|
66dbfd5908
|
Merge branch 'main' into dev
|
2024-12-28 16:27:47 +08:00 |
|
|
|
a5e9c47a36
|
调整活动专区商品列表
|
2024-12-28 16:25:55 +08:00 |
|
|
|
6266a4c147
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-12-28 16:04:02 +08:00 |
|
|
|
50d76b14b2
|
调整活动专区商品列表
|
2024-12-28 16:03:57 +08:00 |
|
|
|
1ebc282e1b
|
Merge pull request 'dev' (#417) from dev into main
Reviewed-on: #417
|
2024-12-28 11:07:33 +08:00 |
|
|
|
35a646ca3e
|
refactor(admin): 移除 IndexController 中的冗余参数
- 在 IndexController 类中的 demo2 方法中，移除了 success 方法的冗余参数 $res
- 优化了代码结构，提高了代码的可读性和维护性
|
2024-12-28 11:06:06 +08:00 |
|
|
|
715f84d2f2
|
修改采购单价格的错误
|
2024-12-27 17:56:18 +08:00 |
|
|
|
ccc774593a
|
修改采购单价格的错误
|
2024-12-27 17:36:30 +08:00 |
|
|
|
91a119c896
|
修改预订单采购商品的错误
|
2024-12-27 17:30:00 +08:00 |
|
|
|
26da169c1f
|
修改商品分类价格配置
|
2024-12-27 16:47:56 +08:00 |
|
|
|
456059d242
|
Merge pull request 'dev' (#416) from dev into main
Reviewed-on: #416
|
2024-12-27 11:32:35 +08:00 |
|
|
|
69030f1fbc
|
修改活动专区商品排序
|
2024-12-27 11:31:54 +08:00 |
|
|
|
bebbd7083d
|
修改采购商品信息
|
2024-12-27 11:08:11 +08:00 |
|
|
|
178a4b5223
|
Merge pull request 'dev' (#415) from dev into main
Reviewed-on: #415
|
2024-12-26 18:05:52 +08:00 |
|
|
|
b1b3396c0b
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-12-26 18:05:27 +08:00 |
|
|
|
b2d125448f
|
feat(admin): 添加 demo2 接口
- 在 IndexController 中新增 demo2 方法
- 使用 DemoLogic::test() 进行逻辑处理
- 返回成功信息和处理结果
|
2024-12-26 18:05:22 +08:00 |
|
|
|
0e2b83587b
|
采购商品添加生产日期、保质期
|
2024-12-26 17:04:58 +08:00 |
|
|
|
5ccd1c27b2
|
Merge pull request 'dev' (#414) from dev into main
Reviewed-on: #414
|
2024-12-26 11:49:18 +08:00 |
|
|
|
e5fbfe2993
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-12-26 11:42:31 +08:00 |
|
|
|
a695d47934
|
调整采购单
|
2024-12-26 11:42:26 +08:00 |
|
|
|
a1b759b0aa
|
refactor(warehouse): 优化仓库产品逻辑中的订单类型判断
- 将原有的 != 7 判断条件改为 in_array([1,4])，以提高代码可读性和维护性
- 此修改仅在 order_type 不等于 6 的情况下生效，不影响其他逻辑
|
2024-12-26 11:27:58 +08:00 |
|
|
|
6f39a58b16
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-12-26 10:45:20 +08:00 |
|
|
|
2bafdff052
|
feat(DemoLogic): 更新产品价格并添加酒店价格设置
- 在更新 StoreProduct 价格后，添加成功更新的逻辑，将 ceshi_two 表中的状态设置为 1
- 新增酒店价格设置，与食堂价格设置类似
- 优化代码结构，提高可读性和维护性
|
2024-12-26 10:44:56 +08:00 |
|
|
|
0f0459de19
|
Merge pull request 'dev' (#413) from dev into main
Reviewed-on: #413
|
2024-12-25 17:57:36 +08:00 |
|
|
|
e722c1a773
|
修改小程序端提交采购信息
|
2024-12-25 17:55:53 +08:00 |
|
|
|
e063fcfe7f
|
修改分组价格设置
|
2024-12-25 15:18:34 +08:00 |
|
|
|
04b98e4b63
|
修改分类
|
2024-12-25 14:10:28 +08:00 |
|
|
|
1d9b9692d1
|
Merge pull request '修改采购单生成规则' (#412) from dev into main
Reviewed-on: #412
|
2024-12-25 11:39:02 +08:00 |
|
|
|
77a1969ceb
|
修改采购单生成规则
|
2024-12-25 11:38:11 +08:00 |
|
|
|
d0294567b7
|
Merge pull request 'dev' (#411) from dev into main
Reviewed-on: #411
|
2024-12-24 17:33:14 +08:00 |
|
|
|
ed01ef1b9a
|
修改活动专区商品列表导出
|
2024-12-24 17:32:49 +08:00 |
|
|
|
f265a07cd5
|
修改活动专区商品列表导出
|
2024-12-24 16:54:00 +08:00 |
|
|
|
74540a66b8
|
Merge pull request 'dev' (#410) from dev into main
Reviewed-on: #410
|
2024-12-24 16:43:08 +08:00 |
|
|
|
a316fe15cc
|
修改活动专区商品列表导出
|
2024-12-24 16:42:29 +08:00 |
|
|
|
c6941df7cc
|
修改活动专区商品列表导出
|
2024-12-24 16:41:45 +08:00 |
|
|
|
3c8a8d3c76
|
Merge pull request 'dev' (#409) from dev into main
Reviewed-on: #409
|
2024-12-24 16:12:46 +08:00 |
|
|
|
58224a6e62
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-12-24 15:18:56 +08:00 |
|
|
|
e48a8e5d7d
|
修改活动专区商品列表和导出
|
2024-12-24 15:18:51 +08:00 |
|
|
|
87bdbea515
|
Merge pull request 'dev' (#408) from dev into main
Reviewed-on: #408
|
2024-12-24 10:48:41 +08:00 |
|
|
|
785a3a8615
|
fix(app): 修复购买产品优惠时的支付类型名称显示问题
- 移除了对 ProductOffer::push($offer) 的注释，恢复了该功能
- 优化了 PurchaseProductOfferLogic 中的逻辑，确保正确显示支付类型名称
|
2024-12-24 10:48:12 +08:00 |
|
