|
|
209d4366bf
|
添加门店预订单列表
|
2025-01-20 14:32:12 +08:00 |
|
|
|
f0b7f234f4
|
Merge pull request 'dev' (#473) from dev into main
Reviewed-on: #473
|
2025-01-20 11:25:22 +08:00 |
|
|
|
bd6018ab1b
|
调整往期补单
|
2025-01-18 16:38:54 +08:00 |
|
|
|
4c918cca71
|
feat(purchase): 一键添加往期采购商品功能
- 新增 AddPurchasesOneClick 方法实现一键添加往期采购商品
- 更新采购订单逻辑，支持往期补单采购
- 修改仓库产品逻辑，优化订单类型判断条件
- 调整订单列表显示，区分往期补单出库和入库
|
2025-01-18 16:34:30 +08:00 |
|
|
|
92de8b8ead
|
修改微信实际支付金额
|
2025-01-18 14:35:07 +08:00 |
|
|
|
69870c6dd6
|
商品添加活动价
|
2025-01-18 11:43:40 +08:00 |
|
|
|
0ec22bf2d7
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2025-01-17 16:55:45 +08:00 |
|
|
|
82edbfd35a
|
预订单商品添加门店出货
|
2025-01-17 16:55:39 +08:00 |
|
|
|
5890cb68ec
|
feat(warehouse): 添加出库单 ID 和仓库 ID 字段
- 在创建仓库产品记录时，增加了 outbound_id 和 warehouse_id 字段
- outbound_id 从请求参数中获取，若不存在则默认为 0
- warehouse_id 固定为 1，可能是默认仓库或首个仓库
|
2025-01-17 10:27:41 +08:00 |
|
|
|
81ba9228c5
|
Merge pull request '添加预订单商品关联采购订单' (#472) from dev into main
Reviewed-on: #472
|
2025-01-16 17:09:41 +08:00 |
|
|
|
39796fd908
|
添加预订单商品关联采购订单
|
2025-01-16 17:01:29 +08:00 |
|
|
|
885cac9ad6
|
Merge pull request 'dev' (#471) from dev into main
Reviewed-on: #471
|
2025-01-16 14:30:27 +08:00 |
|
|
|
5dd1bbd0bf
|
修改门店现金查询
|
2025-01-16 14:29:50 +08:00 |
|
|
|
7bb22503b4
|
修改门店现金查询
|
2025-01-16 14:23:19 +08:00 |
|
|
|
de1c26ac88
|
Merge pull request '修改铺货订单复制' (#470) from dev into main
Reviewed-on: #470
|
2025-01-15 17:58:13 +08:00 |
|
|
|
ddfe35d2c9
|
修改铺货订单复制
|
2025-01-15 17:57:38 +08:00 |
|
|
|
06b60af477
|
Merge pull request '修改库存调拨商品列表，预订单添加同步价格' (#469) from dev into main
Reviewed-on: #469
|
2025-01-15 15:12:51 +08:00 |
|
|
|
ed9ffc8d8c
|
修改库存调拨商品列表，预订单添加同步价格
|
2025-01-15 15:05:40 +08:00 |
|
|
|
abed6f154f
|
Merge pull request 'refactor(StoreOrderCartInfoLogic): 移除不必要的店铺配置验证' (#468) from dev into main
Reviewed-on: #468
|
2025-01-15 15:01:26 +08:00 |
|
|
|
88bb49563b
|
refactor(StoreOrderCartInfoLogic): 移除不必要的店铺配置验证
- 注释掉了用于验证店铺配置的代码块
- 删除了多余的错误提示代码
- 优化了代码结构，提高了代码可读性
|
2025-01-15 15:00:54 +08:00 |
|
|
|
e61518dca5
|
Merge pull request 'refactor(app): 注释掉订单商品状态检查逻辑' (#467) from dev into main
Reviewed-on: #467
|
2025-01-15 14:21:18 +08:00 |
|
|
|
99499f3334
|
refactor(app): 注释掉订单商品状态检查逻辑
在 OrderLogic
|
2025-01-15 14:20:38 +08:00 |
|
|
|
d4104e5e46
|
Merge pull request '修改预订单一键入库' (#466) from dev into main
Reviewed-on: #466
|
2025-01-14 17:47:48 +08:00 |
|
|
|
ed68949326
|
修改预订单一键入库
|
2025-01-14 16:57:17 +08:00 |
|
|
|
07761d7a95
|
Merge pull request '修改批量入库' (#465) from dev into main
Reviewed-on: #465
|
2025-01-14 14:10:42 +08:00 |
|
|
|
c12a519bcd
|
修改批量入库
|
2025-01-14 11:38:18 +08:00 |
|
|
|
1f9d9db187
|
Merge pull request 'dev' (#464) from dev into main
Reviewed-on: #464
|
2025-01-14 11:17:28 +08:00 |
|
|
|
e2014342bd
|
添加批量入库，修改门店库存列表
|
2025-01-14 11:08:47 +08:00 |
|
|
|
3e6410302c
|
修改复制订单备注
|
2025-01-13 16:58:12 +08:00 |
|
|
|
283868bb81
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2025-01-13 16:55:26 +08:00 |
|
|
|
a3dfac406b
|
添加一键复制预订单
|
2025-01-13 16:55:21 +08:00 |
|
|
|
e099f1ca3e
|
Merge pull request 'fix(admin): 修复会员价显示问题' (#463) from dev into main
Reviewed-on: #463
|
2025-01-13 16:15:00 +08:00 |
|
|
|
868ff62e87
|
fix(admin): 修复会员价显示问题
- 在 BeforehandOrderLogic 中添加了 $price 变量，用于存储会员价
- 在 IndexController 中添加了 password_hash 函数调用，可能用于测试或调试
|
2025-01-13 16:14:37 +08:00 |
|
|
|
a8cb358d41
|
Merge pull request 'fix(admin): 优化预订单价格计算逻辑' (#462) from dev into main
Reviewed-on: #462
|
2025-01-13 16:01:22 +08:00 |
|
|
|
02d6cd5e94
|
fix(admin): 优化预订单价格计算逻辑
- 修改了商品价格的计算方式，优先使用 vip_price
- 如果 vip_price 为 0，则使用 StoreProductGroupPrice 中的价格
- 如果 StoreProductGroupPrice 中的价格也为 0，则使用商品的成本价
- 更新了 WarehouseProduct 表中的 vip_price 字段
|
2025-01-13 16:00:43 +08:00 |
|
|
|
c14fd650c4
|
Merge pull request 'dev' (#461) from dev into main
Reviewed-on: #461
|
2025-01-13 15:53:30 +08:00 |
|
|
|
c12ef1cd29
|
refactor(admin): 修改商品采购价为会员价
- 将商品采购价计算逻辑修改为直接使用会员价
- 注释掉原有的通过 StoreProductGroupPrice 模型计算采购价的代码
- 此修改可能影响订单总价计算和后台利润显示
|
2025-01-13 15:52:49 +08:00 |
|
|
|
227bde742d
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2025-01-13 11:14:32 +08:00 |
|
|
|
cce18cfcd5
|
添加确认预订单
|
2025-01-13 11:14:26 +08:00 |
|
|
|
a42e67a79c
|
Merge pull request 'feat(CashFlowLogic): 添加现金流来源标记功能' (#460) from dev into main
Reviewed-on: #460
|
2025-01-13 10:44:19 +08:00 |
|
|
|
0caae69371
|
feat(CashFlowLogic): 添加现金流来源标记功能
- 在现金流记录存在时，将新的来源标记添加到原有标记之后
- 仅在来源标记存在时执行添加操作
|
2025-01-13 10:43:38 +08:00 |
|
|
|
04b5e236c1
|
Merge pull request 'feat(cash_flow): 增加资金流水插入逻辑' (#459) from dev into main
Reviewed-on: #459
|
2025-01-13 10:38:44 +08:00 |
|
|
|
9ed74f26cf
|
feat(cash_flow): 增加资金流水插入逻辑
- 在 CashFlowLogic 类的 insert 方法中添加 source_mark 参数，用于记录资金来源标记
- 在 PayNotifyLogic 类中，订单支付成功后调用 CashFlowLogic 的 insert 方法，传入订单编号作为 source_mark
- 这些修改增加了资金流水记录的详细信息，有助于后续的财务对账和分析
|
2025-01-13 10:38:10 +08:00 |
|
|
|
e2726c6356
|
Merge pull request 'fix(warehouse): 修复仓库产品数量修改逻辑' (#458) from dev into main
Reviewed-on: #458
|
2025-01-11 17:19:54 +08:00 |
|
|
|
8f7d02222b
|
fix(warehouse): 修复仓库产品数量修改逻辑
- 增加对产品数量修改为 0 的特殊处理
- 确保在减少仓库数量时，能够正确增加库存数量
|
2025-01-11 17:19:37 +08:00 |
|
|
|
174ef18861
|
Merge pull request 'dev' (#457) from dev into main
Reviewed-on: #457
|
2025-01-11 17:03:45 +08:00 |
|
|
|
5d73af5719
|
修改门店预订单查询
|
2025-01-11 16:52:14 +08:00 |
|
|
|
f485c956df
|
修改商品调拨
|
2025-01-11 16:15:52 +08:00 |
|
|
|
768068a8ea
|
feat(store_order): 添加订单核销功能
- 新增 writeoff_order 方法实现订单核销功能
- 增加核销码和门店 ID 的参数验证
- 调用 OrderLogic::writeOff 方法进行订单核销
- 返回核销成功或失败的响应
|
2025-01-11 15:27:27 +08:00 |
|
|
|
cc8eb3e72f
|
fix(admin): 修复提前单统计功能问题
- 在创建提前单时添加审核状态字段
- 优化提前单统计查询条件
- 增加按订单类型筛选的功能
- 调整订单类型统计的字段名
|
2025-01-11 14:59:39 +08:00 |
|
