mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,557 Commits 15 Branches 15 Tags
Commit Graph

183 Commits

Author SHA1 Message Date
mkm
d2ecc8a166 Merge pull request 'feat(StoreBranchProductLists): Update product list logic, optimize search conditions, adjust product query fields' (#102) from dev into rose 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/102
 2024-08-04 17:58:56 +08:00
mkm
c9985dfd33 feat(StoreBranchProductLists): Update product list logic, optimize search conditions, adjust product query fields 2024-08-04 17:58:24 +08:00
mkm
5f3e18fe83 Merge pull request 'feat(StoreProductController, WarehouseProductLists, StoreStorageSend): Update stock management logic, optimize inventory checking, adjust storage management methods' (#100) from dev into rose 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/100
 2024-08-04 17:41:48 +08:00
mkm
c6bc0b41e8 feat(StoreProductController, WarehouseProductLists, StoreStorageSend): Update stock management logic, optimize inventory checking, adjust storage management methods 2024-08-04 17:41:24 +08:00
mkm
9fc4095563 Merge pull request 'dev' (#98) from dev into rose 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/98
 2024-08-04 13:13:32 +08:00
mkm
c3a930a9e1 feat(WarehouseProductLogic): 更新仓库产品逻辑，优化商品仓储信息处理，调整库存管理方法 2024-08-04 13:12:54 +08:00
mkm
188904a63b Merge pull request 'dev' (#96) from dev into rose 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/96
 2024-08-03 21:18:07 +08:00
mkm
07b1ebc3c8 feat: 添加月销售商品统计功能 2024-08-03 18:04:52 +08:00
mkm
bc385e3c2f Merge pull request 'feat: 增加查询已支付订单的条件' (#93) from dev into rose 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/93
 2024-08-03 11:37:33 +08:00
mkm
4b2c385b8b feat: 增加查询已支付订单的条件 2024-08-03 11:37:11 +08:00
mkm
f120ad28be Merge pull request 'feat(StoreOrderCartInfoGroupLists, StoreOrderCartInfoTwoLists): 优化了商品单位、分类和店铺名称的获取方式，增加了空值处理' (#82) from erp into rose 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/82
 2024-08-02 19:58:21 +08:00
mkm
5863d9d113 feat(StoreOrderCartInfoGroupLists, StoreOrderCartInfoTwoLists): 优化了商品单位、分类和店铺名称的获取方式，增加了空值处理 2024-08-02 19:56:15 +08:00
mkm
b7ea08c41c Merge pull request 'feat(StoreOrderCartInfoController): 添加了列表二功能及对应搜索条件' (#81) from erp into rose 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/81
 2024-08-02 19:46:23 +08:00
mkm
315fd540ba feat(StoreOrderCartInfoController): 添加了列表二功能及对应搜索条件 2024-08-02 19:43:21 +08:00
mkm
4e9857d9f5 Merge pull request 'feat: 增加根据条件筛选订单功能' (#80) from erp into rose 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/80
 2024-08-02 17:48:33 +08:00
mkm
3745015592 feat: 增加根据条件筛选订单功能 2024-08-02 17:44:00 +08:00
mkm
e36c9416c4 Merge pull request '1' (#77) from erp into rose 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/77
 2024-08-02 11:02:42 +08:00
mkm
a573f817f5 1 2024-08-02 11:01:17 +08:00
mkm
37c9cbd064 Merge pull request 'erp' (#76) from erp into rose 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/76
 2024-08-01 22:54:19 +08:00
mkm
d0842aadc5 1 2024-08-01 22:41:52 +08:00
mkm
4711643bb8 Merge pull request 'feat(SystemStoreStorageLists): 优化了系统商店存储列表的商品名称和图片获取方式' (#75) from erp into rose 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/75
 2024-08-01 16:53:53 +08:00
mkm
a6031b3318 feat(SystemStoreStorageLists): 优化了系统商店存储列表的商品名称和图片获取方式 2024-08-01 16:53:26 +08:00
mkm
55daad5815 Merge pull request 'feat: 添加仓库信息功能' (#73) from erp into rose 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/73
 2024-08-01 15:46:53 +08:00
mkm
e550772d12 feat: 添加仓库信息功能 2024-08-01 15:42:58 +08:00
mkm
a54adbd928 Merge pull request 'erp' (#72) from erp into rose 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/72
 2024-08-01 14:06:51 +08:00
mkm
75a2338337 feat: 添加了仓库产品确认操作 2024-08-01 13:59:30 +08:00
mkm
a441b94e94 feat: 添加仓库和商品仓储信息的管理功能 2024-07-31 18:07:22 +08:00
mkm
ddaef44baf feat: 新增采购订单列表及详情模型与控制器 2024-07-30 17:19:09 +08:00
mkm
518d9fe064 Merge branch 'rose' of https://gitea.lihaink.cn/mkm/multi-store into rose 2024-07-27 11:52:44 +08:00
mkm
99dc835cb1 feat: 添加'开通时间'字段到用户列表，修改线下分润、支付通知等逻辑 2024-07-27 11:52:31 +08:00
mkm
22c89d8ddd feat(OrderEnum): 根据订单状态和退款状态更新订单类型 2024-07-27 10:16:28 +08:00
mkm
8f9ba883a2 feat(StoreOrderCartInfoLists): 修改商品信息查询逻辑 2024-07-26 11:55:19 +08:00
mkm
4e67edcc77 feat: 添加真实姓名字段到用户列表 2024-07-26 11:31:05 +08:00
mkm
945fdac2c2 feat: 添加门店ID字段到用户列表 2024-07-26 10:17:30 +08:00
mkm
0c1b3ed5da feat(UserLists.php): 移除用户编号列 2024-07-26 10:06:58 +08:00
mkm
f4d45c7e5e refactor(UserLists.php): 优化了会员时间的处理逻辑 2024-07-25 11:37:13 +08:00
mkm
fb5fe6574a feat(UserLists.php): 修改会员等级判断逻辑 2024-07-25 09:46:43 +08:00
mkm
dedf7434b3 feat: 添加了对用户列表查询中VIP时间的显示 2024-07-25 09:43:36 +08:00
mkm
c94d247261 feat: 添加了对会员时间的格式化处理 2024-07-25 09:39:28 +08:00
mkm
f08fcc575c feat: 修改UserLists类以支持更多搜索字段 2024-07-20 16:48:42 +08:00
mkm
1fdedb2bc7 feat: 增加'store_id'和'user_ship'搜索条件 2024-07-20 16:31:11 +08:00
mkm
05f77fe9d2 refactor(UserRechargeLists): 修改已支付和未支付的状态显示 2024-07-19 17:48:44 +08:00
liu
073042e3da 增加字段 2024-07-10 14:43:55 +08:00
liu
511380c0e4 修改限制查询 2024-07-10 14:42:46 +08:00
liu
4de5aef537 修改收银台预约记录 2024-07-10 11:55:30 +08:00
liu
daf05f3314 补充核销码 2024-07-10 11:20:29 +08:00
liu
6196e08f81 小程序预约商品提货记录 2024-07-10 11:17:46 +08:00
liu
74c0456f1a 商品规格 2024-07-08 16:09:03 +08:00
mkm
07ffabfa52 feat: 移除StoreFinanceFlowLists中的冗余代码 2024-07-08 15:18:56 +08:00
liu
c324d025d5 列表厨师判断 2024-07-08 10:36:26 +08:00