|
|
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 |
|
|
|
b2a3df87c4
|
refactor(purchase_product_offer): 重构采购产品报价逻辑
- 注释掉 ProductOffer::push($offer) 行，暂时不推送报价信息
- 在 catch 块中添加调试信息输出，便于排查错误
- 修复商户和供货商价格计算逻辑，优化价格计算过程
|
2024-12-24 10:47:55 +08:00 |
|
|
|
71d861dd78
|
fix(purchase): 修复采购价计算逻辑
- 新增供货价计算步骤，作为商户价和零售价的基础
- 修改商户价和零售价的计算方式，基于供货价进行加成
- 优化价格配置的生成逻辑，确保各层级价格正确计算
|
2024-12-24 10:38:40 +08:00 |
|
|
|
8a64c1cefa
|
Merge pull request 'dev' (#407) from dev into main
Reviewed-on: #407
|
2024-12-24 09:34:13 +08:00 |
|
|
|
1f82805875
|
fix(app): 修复支付回调和订单推送的相关问题
- 修改 PayNotifyLogic 中异常捕获，使用 Throwable 代替 Exception
- 优化 OrderXprinterPushSend 中的订单信息获取和处理
|
2024-12-24 09:27:39 +08:00 |
|
|
|
5727572e0d
|
fix(queue): 优化小票打印逻辑
- 增加了 DictData 模型的引用
- 使用商店 ID 查询打印机配置，并在存在时使用该配置进行打印
|
2024-12-24 09:07:25 +08:00 |
|
|
|
2be22adcb3
|
fix(printer): 修复小票打印商品名称错误
- 在 PayNotifyLogic 中添加 XpsdkPrintApi 类的引用
- 在 OrderXprinterPushSend 中修正商品名称的获取方式
- 优化代码格式和结构，提高可读性
|
2024-12-23 18:12:15 +08:00 |
|
|
|
df8f3523f6
|
feat(printer): 添加订单打印功能
- 在 PayNotifyLogic 中增加订单打印逻辑
- 实现 XpsdkPrintApi 类的订单打印方法
- 添加 OrderXprinterPushSend 队列消费者处理订单打印
- 优化打印内容格式，包括订单信息、商品列表等
|
2024-12-23 17:52:58 +08:00 |
|
|
|
147eefa363
|
Merge pull request '调整商品分类的错误' (#406) from dev into main
Reviewed-on: #406
|
2024-12-23 17:42:55 +08:00 |
|
|
|
be6cf0aa3f
|
调整商品分类的错误
|
2024-12-23 17:42:48 +08:00 |
|
|
|
b63d19bfdf
|
Merge pull request 'dev' (#405) from dev into main
Reviewed-on: #405
|
2024-12-23 17:06:26 +08:00 |
|
|
|
c66204184b
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-12-23 17:04:10 +08:00 |
|
|
|
93dad81183
|
调整商品分类的错误
|
2024-12-23 17:03:51 +08:00 |
|
|
|
56b14aedd2
|
Merge pull request 'feat(admin): 增加商品进销存价格列表显示' (#404) from dev into main
Reviewed-on: #404
|
2024-12-23 15:53:32 +08:00 |
|
|
|
127445c074
|
feat(admin): 增加商品进销存价格列表显示
- 在 StoreProductPriceLists 类中添加商品的 current_purchase、current_cost 和 current_price 字段
- 从 StoreProduct 模型中获取商品的 purchase、cost 和 price 信息
- 在列表中显示商品的当前进价、成本价和销售价
|
2024-12-23 15:39:18 +08:00 |
|
|
|
c7b7c93a4e
|
Merge pull request 'dev' (#403) from dev into main
Reviewed-on: #403
|
2024-12-21 23:38:37 +08:00 |
|
|
|
3710728806
|
fix(admin): 修复后台预订单商品价格逻辑
- 增加用户非会员价格判断，避免非会员显示会员价格
- 优化价格查询逻辑，提高代码可读性和性能
|
2024-12-21 23:37:35 +08:00 |
|
|
|
b0af0a70bb
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-12-21 17:00:01 +08:00 |
|
|
|
325dee0181
|
添加活动专区商品导出
|
2024-12-21 16:59:52 +08:00 |
|
|
|
f8345d1409
|
Merge pull request 'dev' (#402) from dev into main
Reviewed-on: #402
|
2024-12-21 11:21:21 +08:00 |
|
|
|
181bd0a689
|
refactor(admin): 仓库产品列表页面优化
- 注释掉了一段用于计算采购价格和总价的代码
- 注释掉了一段用于获取产品价格的代码
- 保留了获取产品名称、图片、单位名称、商店信息和顶级分类名称的代码
|
2024-12-21 11:19:12 +08:00 |
|
