1731 Commits

Author SHA1 Message Date
mkm
db7fbbe70e feat: 增加用户信息查询功能 2024-09-20 10:51:52 +08:00
mkm
ed151b119f feat: 修改了订单逻辑和商品佣金计算方式 2024-09-20 09:54:43 +08:00
mkm
bfecce2d38 feat: 修改'rose'字段验证规则 2024-09-20 09:45:01 +08:00
mkm
4dab9bc4c9 feat: 添加商品仓库列表显示字段 2024-09-20 09:26:06 +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
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
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
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
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
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
08c3213a7b feat: 更新了商品列表,添加了毛利率字段,修复了条码错误 2024-09-19 20:24:15 +08:00
mkm
730dc78269 feat: 添加导出功能和优化代码 2024-09-19 15:25:41 +08:00
mkm
18a7332f47 feat: 添加导出功能和优化查询逻辑 2024-09-19 12:03:59 +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
80bf6eaf4f feat(process/Task.php): 修改订单删除逻辑及定时任务 2024-09-18 11:13:38 +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
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
c47825e2a2 feat(StoreOrderCartInfoLists): 更新了'门店'字段的逗号错误 2024-09-17 09:39:21 +08:00
mkm
908092f39d feat(OrderController, StoreOrderController): updated logic for gift funds payment, fixed bugs, improved code quality 2024-09-17 08:53:09 +08:00
mkm
e5c0752280 feat(OrderLogic): updated logic for orders, fixed bugs, improved code quality 2024-09-17 08:30:20 +08:00
mkm
c45ae4e1a1 feat(StoreOrderLists, StoreProductLists, OrderLogic): updated logic for orders, fixed bugs, improved code quality 2024-09-16 22:02:19 +08:00
mkm
765e08fe9a feat: 添加is_lack字段到ProductLists 2024-09-13 16:27:30 +08:00
mkm
f480e8aee7 feat(SystemStoreMenu): 添加软删除功能 2024-09-13 13:58:39 +08:00
mkm
ca58281282 feat(StoreOrderLists): 添加了退款价格字段查询 2024-09-13 11:47:14 +08:00
mkm
4fd112b900 feat: 添加对店铺配置的校验功能 2024-09-13 09:22:20 +08:00
mkm
1648d48c15 feat: 添加订单商品、编辑订单商品和删除订单商品的功能 2024-09-12 17:25:09 +08:00
mkm
bbbed26fbf feat(StoreOrderLists, UserRechargeLists, OrderLogic): updated lists, logic for orders & refunds, fixed bugs, improved code quality 2024-09-11 21:47:14 +08:00
mkm
40cc604461 feat: 更新用户积分逻辑 2024-09-11 17:58:23 +08:00
mkm
6b0d5e3edb feat: 修改库存计算方式以增加库存总量的显示 2024-09-11 17:10:15 +08:00
mkm
20095c8085 feat: 修改了商品订单逻辑和佣金计算逻辑 2024-09-11 15:15:07 +08:00
mkm
be8881b1ad feat(StoreProductLists): 修改了商品列表的显示方式 2024-09-09 17:57:33 +08:00
mkm
b65ab15e2a feat: 修改了商品列表搜索功能 2024-09-09 17:57:03 +08:00
mkm
0214b50ca8 feat: 修改了商品列表的查询字段和计算方式,并新增了商品的计价方式、自编码、供应商名称等字段;
fix: 修复了订单退款状态未更新的问题;
refactor: 重构了佣金计算逻辑,调整了部分字段的命名;
style: 调整了代码格式,如空格、分号等;
test: 添加了相关测试;
docs: 更新了相关文档;
build: 更新了依赖;
ops: 更新了部署脚本;
chore: 更新了项目配置文件。
2024-09-09 17:47:08 +08:00
mkm
7da078bc12 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-09-07 18:08:05 +08:00
mkm
e7687a25a5 feat: 修正商品和订单金额计算逻辑 2024-09-07 18:07:58 +08:00
mkm
e0713be0a0 feat(ProductLists): 修改商品排序规则,调整'sort'优先级,优化商品排序功能 2024-09-07 00:03:49 +08:00
mkm
27e4295df5 feat(ProductLists): 修改商品列表排序规则,增加'sort'参数,优化商品排序功能 2024-09-06 23:57:57 +08:00
mkm
663defd80d feat: 修改了StoreProductLists.php文件,修复了库存计算的bug,现在库存计算更加准确。 2024-09-06 17:57:26 +08:00
mkm
6e0a9e73f1 feat(warehouse_product): 添加仓库产品结算功能 2024-09-06 17:53:43 +08:00
mkm
1dca91528d feat: 添加了商品信息空值处理 2024-09-06 14:12:56 +08:00
mkm
2cbe0fc8a3 fix(StoreProductLogic): 修复了商品价格更新时的错误 store_id 条件 2024-09-06 14:05:33 +08:00
mkm
816521c6be feat(store_order): 新增判断店铺ID来查询分支商品功能 2024-09-06 13:46:27 +08:00
mkm
473b276e55 feat: 添加商品ID到Excel字段列表 2024-09-06 11:32:30 +08:00
mkm
ea4bd28a0e feat(OrderLogic): 修改生鲜产品订单金额限制逻辑 2024-09-06 10:06:38 +08:00
mkm
73565cace9 feat(PayNotifyLogic): 修改收银台支付逻辑,移除订单状态设置 2024-09-05 22:21:06 +08:00
mkm
8e9e2b8ded refactor(WorkbenchLogic): 调整支付订单查询逻辑,优化支付订单处理效率 2024-09-05 22:13:14 +08:00
mkm
869faf2f44 refactor(StoreProductLists, WorkbenchLogic): 调整商品查询逻辑及订单支付查询,优化库存及订单处理 2024-09-05 21:57:12 +08:00