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

1932 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mkm
0c485b8433 feat(WarehouseOrderController): 更新仓库订单查询方法，加入软删除功能 2024-09-22 12:00:36 +08:00
mkm
04eabec632 feat: 使用withTrashed方法查询带删除标记的产品信息 2024-09-22 11:45:25 +08:00
mkm
1b876d13dc feat: 修改了支付逻辑以支持浮点数金额 2024-09-21 21:45:16 +08:00
mkm
7da6421aae Merge pull request 'feat(StoreOrderCartInfoTwoLists): 修改查询字段添加oid' (#229) from bb into main 
Reviewed-on: #229
 2024-09-20 11:14:14 +08:00
mkm
29b750b177 feat(StoreOrderCartInfoTwoLists): 修改查询字段添加oid 2024-09-20 11:13:54 +08:00
mkm
4ea350a67b Merge pull request 'feat(StoreOrderCartInfoTwoLists): 根据请求参数调整导出逻辑' (#228) from bb into main 
Reviewed-on: #228
 2024-09-20 11:10:31 +08:00
mkm
e97088cd6a feat(StoreOrderCartInfoTwoLists): 根据请求参数调整导出逻辑 2024-09-20 11:10:13 +08:00
mkm
ea4c05d271 Merge pull request 'feat(StoreOrderCartInfoTwoLists): 增加导出订单功能' (#227) from bb into main 
Reviewed-on: #227
 2024-09-20 11:07:57 +08:00
mkm
28c25f9b32 feat(StoreOrderCartInfoTwoLists): 增加导出订单功能 2024-09-20 11:07:33 +08:00
mkm
92f5d912f7 Merge pull request 'feat(StoreOrderCartInfoTwoLists): 修改查询逻辑，增加对UID的判断' (#226) from bb into main 
Reviewed-on: #226
 2024-09-20 10:55:54 +08:00
mkm
bd113c4ea2 feat(StoreOrderCartInfoTwoLists): 修改查询逻辑，增加对UID的判断 2024-09-20 10:55:38 +08:00
mkm
9d3f33dabf Merge pull request 'feat: 增加用户信息查询功能' (#225) from bb into main 
Reviewed-on: #225
 2024-09-20 10:53:20 +08:00
mkm
df4a0feb5d feat: 增加用户信息查询功能 2024-09-20 10:53:00 +08:00
mkm
ed151b119f feat: 修改了订单逻辑和商品佣金计算方式 2024-09-20 09:54:43 +08:00
mkm
83d98057de Merge pull request 'feat: 修改'rose'字段验证规则' (#224) from dev into main 
Reviewed-on: #224
 2024-09-20 09:45:26 +08:00
mkm
bfecce2d38 feat: 修改'rose'字段验证规则 2024-09-20 09:45:01 +08:00
mkm
2367fcfc87 Merge pull request 'feat: 添加商品仓库列表显示字段' (#223) from dev into main 
Reviewed-on: #223
 2024-09-20 09:26:38 +08:00
mkm
4dab9bc4c9 feat: 添加商品仓库列表显示字段 2024-09-20 09:26:06 +08:00
mkm
f0df501e8c Merge pull request 'feat(CommissionProductLogic): updated calc logic for prod comm, added loss calc, & updated rel db fields' (#222) from dev into main 
Reviewed-on: #222
 2024-09-19 23:05:14 +08:00
mkm
ae0faa68c2 feat(CommissionProductLogic): updated calc logic for prod comm, added loss calc, & updated rel db fields 2024-09-19 23:04:48 +08:00
mkm
150b540365 Merge pull request 'feat(CommissionProductLogic): updated calc logic for prod comm, added loss calc, & updated rel db fields' (#221) from dev into main 
Reviewed-on: #221
 2024-09-19 22:56:12 +08:00
mkm
bf5a070046 feat(CommissionProductLogic): updated calc logic for prod comm, added loss calc, & updated rel db fields 2024-09-19 22:55:52 +08:00
mkm
75f33778e5 Merge pull request 'feat(CommissionProductLogic): updated prod calc logic for user ship condition, added source check for order, improved code quality' (#220) from dev into main 
Reviewed-on: #220
 2024-09-19 22:45:08 +08:00
mkm
98bd00fe01 feat(CommissionProductLogic): updated prod calc logic for user ship condition, added source check for order, improved code quality 2024-09-19 22:44:47 +08:00
mkm
9f2f614a5d Merge pull request 'feat(CommissionProductLogic): updated calc logic for prod comm, added loss calc, & updated rel db fields' (#219) from dev into main 
Reviewed-on: #219
 2024-09-19 22:30:28 +08:00
mkm
0718d0635b feat(CommissionProductLogic): updated calc logic for prod comm, added loss calc, & updated rel db fields 2024-09-19 22:26:48 +08:00
mkm
43a0560edc Merge pull request 'feat(CommissionProductLogic): updated user ship condition, added in_array check for user_ship, improved code quality' (#218) from dev into main 
Reviewed-on: #218
 2024-09-19 22:06:49 +08:00
mkm
fe10a63fe0 feat(CommissionProductLogic): updated user ship condition, added in_array check for user_ship, improved code quality 2024-09-19 22:06:30 +08:00
mkm
80c8c0c5a3 Merge pull request 'feat(CommissionProductLogic): updated calculation logic for product commission, added loss calculation and updated related database fields' (#217) from dev into main 
Reviewed-on: #217
1.1.3 		2024-09-19 21:22:35 +08:00
mkm
7a7c9c2ad7 feat(CommissionProductLogic): updated calculation logic for product commission, added loss calculation and updated related database fields 2024-09-19 21:13:02 +08:00
mkm
1018c3fa7d Merge pull request 'feat: 更新了商品列表，添加了毛利率字段，修复了条码错误' (#216) from dev into main 
Reviewed-on: #216
 2024-09-19 20:25:33 +08:00
mkm
08c3213a7b feat: 更新了商品列表，添加了毛利率字段，修复了条码错误 2024-09-19 20:24:15 +08:00
mkm
cf3948060d Merge pull request 'feat: 添加导出功能和优化代码' (#215) from dev into main 
Reviewed-on: #215
 2024-09-19 15:30:27 +08:00
mkm
730dc78269 feat: 添加导出功能和优化代码 2024-09-19 15:25:41 +08:00
mkm
4931c0a30a Merge pull request 'feat: 添加导出功能和优化查询逻辑' (#214) from dev into main 
Reviewed-on: #214
 2024-09-19 12:04:20 +08:00
mkm
18a7332f47 feat: 添加导出功能和优化查询逻辑 2024-09-19 12:03:59 +08:00
mkm
a58795ef7d Merge pull request 'dev' (#213) from dev into main 
Reviewed-on: #213
 2024-09-19 11:48:29 +08:00
mkm
88c9fd557c feat: 调整了商品佣金计算逻辑，增加了损耗计算，并更新了相关数据库字段。 2024-09-19 11:17:27 +08:00
mkm
3e794f47a2 feat: 添加资金流向模型软删除功能 2024-09-19 09:42:11 +08:00
mkm
756031dc1f feat(CommissionProductLogic): deleted file, updated calculation logic for product commission 2024-09-18 22:29:24 +08:00
mkm
d6dd96af8c feat: 修改商品添加和编辑逻辑 2024-09-18 18:06:35 +08:00
mkm
f2224ebe3d Merge pull request 'feat(process/Task.php): 修改订单删除逻辑及定时任务' (#212) from dev into main 
Reviewed-on: #212
 2024-09-18 11:16:19 +08:00
mkm
80bf6eaf4f feat(process/Task.php): 修改订单删除逻辑及定时任务 2024-09-18 11:13:38 +08:00
mkm
24cdf6a892 Merge pull request 'feat(StoreProductLogic): updated logic for product type 5, added sales condition, improved code quality' (#210) from dev into main 
Reviewed-on: #210
 2024-09-17 10:21:00 +08:00
mkm
19be49f0d5 feat(StoreProductLogic): updated logic for product type 5, added sales condition, improved code quality 2024-09-17 10:20:43 +08:00
mkm
ab06ae6b32 Merge pull request 'feat(ProductController, ProductLists): updated logic for product lists, added access control, fixed bugs, improved code quality' (#209) from dev into main 
Reviewed-on: #209
 2024-09-17 10:01:06 +08:00
mkm
c1a107886d feat(ProductController, ProductLists): updated logic for product lists, added access control, fixed bugs, improved code quality 2024-09-17 10:00:39 +08:00
mkm
7034a24cf0 Merge pull request 'feat(StoreOrderCartInfoLists): 更新了'门店'字段的逗号错误' (#208) from dev into main 
Reviewed-on: #208
 2024-09-17 09:39:48 +08:00
mkm
c47825e2a2 feat(StoreOrderCartInfoLists): 更新了'门店'字段的逗号错误 2024-09-17 09:39:21 +08:00
mkm
a8184c4ca5 Merge pull request 'feat(OrderController, StoreOrderController): updated logic for gift funds payment, fixed bugs, improved code quality' (#207) from dev into main 
Reviewed-on: #207
 2024-09-17 08:54:45 +08:00