2836 Commits

Author SHA1 Message Date
mkm
4f7c8ffa85 Merge pull request '修改商品列表搜索' (#16) from dev into main
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/16
2025-04-16 16:44:58 +08:00
881164ebbd 修改商品列表搜索 2025-04-16 16:43:41 +08:00
mkm
0d6c8f8057 Merge pull request '调试导入赠品' (#15) from dev into main
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/15
2025-04-16 10:29:23 +08:00
fae49b796f 调试导入赠品 2025-04-16 10:24:40 +08:00
mkm
7e8a5d5420 Merge pull request 'dev' (#14) from dev into main
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/14
2025-04-14 17:31:58 +08:00
3d47bb1b5d 修改预订单商品退库 2025-04-14 17:30:52 +08:00
c19efa176a 商品图片管理1 2025-04-14 16:02:44 +08:00
c19ef6080a 商品图片管理 2025-04-14 15:33:52 +08:00
mkm
e220e660f8 Merge pull request 'dev' (#13) from dev into main
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/13
2025-04-14 14:45:22 +08:00
daf4b858ce 修改采购价格录入限制 2025-04-14 14:44:25 +08:00
e6e0eaadab 调试图片上传和识别 2025-04-14 09:40:54 +08:00
mkm
a4eb84500a Merge pull request 'fix(product): 修复商品价格保存逻辑' (#12) from dev into main
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/12
2025-04-12 15:57:00 +08:00
mkm
f9d969c85c fix(product): 修复商品价格保存逻辑
- 在 StoreProductPriceLogic 类中,将价格保存逻辑中的 'price' 字段错误地设置为 'vip_price' 的值
- 已将相关代码修正,确保 'price' 字段正确保存为 'price' 的值
2025-04-12 15:56:30 +08:00
mkm
0ae06f9bfb Merge pull request '商品列表添加改价' (#11) from dev into main
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/11
2025-04-12 11:43:30 +08:00
41264fd9a0 商品列表添加改价 2025-04-12 11:24:54 +08:00
mkm
40ede21710 Merge pull request '修改往期补单入库' (#10) from dev into main
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/10
2025-04-11 10:24:37 +08:00
ed4d7bb3ae 修改往期补单入库 2025-04-11 10:02:50 +08:00
mkm
f7379b663a Merge pull request 'dev' (#9) from dev into main
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/9
2025-04-10 14:36:21 +08:00
d13c5c16b0 修改小程序端订单详情 2025-04-10 14:24:27 +08:00
776ee0bfbc Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into HEAD 2025-04-09 12:28:14 +08:00
1182ee6279 调拨单详情备注 2025-04-09 12:21:35 +08:00
mkm
dcaca31635 add tencent sdk 2025-04-08 15:33:59 +08:00
8d085e688e 调拨订单导出和插入修改1 2025-04-08 14:44:26 +08:00
5e378a3372 调拨订单导出和插入修改1 2025-04-08 14:40:56 +08:00
83fe8c4539 调拨订单导出和插入修改 2025-04-08 12:40:18 +08:00
95514a0da6 调拨订单导出和插入修改 2025-04-08 12:32:33 +08:00
d05a8c842d 调拨订单导出和插入修改 2025-04-08 12:23:52 +08:00
dd681470d8 调拨订单导出和插入arr 2025-04-08 11:39:42 +08:00
be9781f170 调拨订单导出和插入 2025-04-08 11:23:09 +08:00
6e291277d0 调拨订单导出和插入 2025-04-08 11:18:54 +08:00
c26790ebbe excel导入铺货。修改接口 2025-04-07 14:01:01 +08:00
08fa715e73 excel导入铺货。修改接口 2025-04-07 13:37:23 +08:00
4875159679 excel导入铺货。修改接口 2025-04-07 12:10:28 +08:00
e3dc0985bd excel导入铺货 2025-04-07 10:46:37 +08:00
3a1f256fe9 Merge pull request '修改商品出库的错误' (#8) from dev into main
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/8
2025-04-06 10:57:12 +08:00
d1a4e5acdf 修改商品出库的错误 2025-04-06 10:56:09 +08:00
d71b3ddefa Merge pull request '修改采购价格录入的错误' (#7) from dev into main
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/7
2025-04-06 10:35:44 +08:00
850773a2fd 修改采购价格录入的错误 2025-04-06 10:33:06 +08:00
5b37749696 Merge pull request '修改预订单高级会员导出' (#6) from dev into main
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/6
2025-04-03 16:52:01 +08:00
8aa2740b50 修改预订单高级会员导出 2025-04-03 16:51:06 +08:00
8deb9a32bb Merge pull request '修改预订单高级会员导出' (#5) from dev into main
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/5
2025-04-03 14:59:05 +08:00
2439429e4c 修改预订单高级会员导出 2025-04-03 14:58:12 +08:00
mkm
d3c4bf923f Merge pull request '修改预订单高级会员导出' (#4) from dev into main
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/4
2025-04-03 11:40:30 +08:00
b55503650c 修改预订单高级会员导出 2025-04-03 11:40:07 +08:00
mkm
ef846fe23d Merge pull request 'dev' (#3) from dev into main
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/3
2025-04-03 11:32:03 +08:00
mkm
94676eb4ea Merge branch 'main' into dev 2025-04-03 11:30:22 +08:00
7ea7dde782 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2025-04-03 11:29:02 +08:00
407553baaf 修改预订单高级会员导出 2025-04-03 11:28:58 +08:00
mkm
98181dfbf9 Merge pull request '更新 app/api/lists/order/CartList.php' (#2) from dev into main
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/2
2025-04-02 16:12:18 +08:00
mkm
ba6d76de7e 更新 app/api/lists/order/CartList.php 2025-04-02 16:12:02 +08:00