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

1775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mkm
3108b35e50 Merge pull request 'feat: 后台下单功能实现及优化' (#185) from dev into main 
Reviewed-on: #185
 2024-09-03 15:52:22 +08:00
mkm
5b64d0d9b2 feat: 后台下单功能实现及优化 2024-09-03 15:50:17 +08:00
mkm
fd5f1636b8 Merge pull request 'refactor(WorkbenchLogic): 调整支付订单查询限制，优化查询效率' (#184) from dev into main 
Reviewed-on: #184
 2024-09-02 21:11:04 +08:00
mkm
729b05efbf refactor(WorkbenchLogic): 调整支付订单查询限制，优化查询效率 2024-09-02 21:10:48 +08:00
mkm
9f25fe82b6 Merge pull request 'refactor(PayNotifyLogic, StoreOrderController): 移除无用核销逻辑，优化库存更新流程' (#183) from dev into main 
Reviewed-on: #183
 2024-09-02 20:53:25 +08:00
mkm
3c305cfaf0 refactor(PayNotifyLogic, StoreOrderController): 移除无用核销逻辑，优化库存更新流程 2024-09-02 20:52:25 +08:00
mkm
df8d888499 Merge pull request 'dev' (#182) from dev into main 
Reviewed-on: #182
 2024-09-02 16:53:59 +08:00
mkm
a5d93516b2 feat(StoreOrderLogic): 新增针对特定商店ID的价格更新逻辑 2024-09-02 16:52:49 +08:00
mkm
efc7286162 feat: 添加或修改API； 
fix: 修复错误；
refactor: 重写/重构代码，但未改变API行为；
style: 添加空格、格式化、缺失的分号等；
test: 添加缺失的测试或修正现有的测试；
docs: 更新文档如readme；
build: 更新依赖、项目版本；
ops: 影响操作组件如基础设施、部署、备份、恢复；
chore: 修改.gitignore；

请根据以上信息生成规范的用中文conventional commit message，谨慎选择最能说明更改的Commit type，请控制你的输出在一行内，你的回复中应该仅有一条commit message。
Your reply format:
 2024-09-02 15:31:07 +08:00
mkm
f44698d8f2 Merge pull request 'dev' (#181) from dev into main 
Reviewed-on: #181
 2024-09-02 12:07:56 +08:00
mkm
9962d9ae47 feat: 添加创建出库单功能及修改订单导出逻辑 2024-09-02 12:07:25 +08:00
mkm
0aa79334ac feat(WarehouseLogic): 新增交易金额和获得利润统计功能，优化库存计算 2024-09-01 22:23:15 +08:00
mkm
14ffe62487 feat: 修改了库存统计和负库存更新逻辑 2024-09-01 18:04:07 +08:00
mkm
97c4cf60d5 feat: 修改仓库逻辑以优化库存计算 2024-09-01 17:29:58 +08:00
mkm
5ef9534805 Merge pull request 'feat: 更新仓库逻辑以计算商品和门店的总库存' (#180) from dev into main 
Reviewed-on: #180
 2024-09-01 16:58:58 +08:00
mkm
9758171b39 feat: 更新仓库逻辑以计算商品和门店的总库存 2024-09-01 16:58:21 +08:00
mkm
b5c99cf66e Merge pull request 'feat: 修改仓库逻辑以优化库存产品价格计算' (#179) from dev into main 
Reviewed-on: #179
 2024-09-01 16:11:05 +08:00
mkm
d85c837a9b feat: 修改仓库逻辑以优化库存产品价格计算 2024-09-01 16:10:55 +08:00
mkm
1782b00d17 Merge pull request 'feat: 新增库存和价值更新功能' (#178) from dev into main 
Reviewed-on: #178
 2024-09-01 15:55:04 +08:00
mkm
e3b6bb9831 feat: 新增库存和价值更新功能 2024-09-01 15:51:23 +08:00
mkm
c51b219906 Merge pull request 'dev' (#177) from dev into main 
Reviewed-on: #177
 2024-09-01 12:37:54 +08:00
mkm
2d10a79e54 feat: 增加'export'参数和价值计算功能 2024-09-01 12:37:16 +08:00
mkm
d9b553cca3 feat: 实现订单列表导出功能 2024-09-01 12:06:28 +08:00
mkm
4344e46544 feat: 修改了CapitalFlowLogic, PayNotifyLogic, StoreFinanceFlowLogic, WeChatMnpService等文件，添加了新的参数$key，修改了storeIncome和storeExpense方法，并调整了部分变量名称。 2024-09-01 10:35:40 +08:00
mkm
ca4094e2fb Merge pull request 'feat(CommissionProductLogic): 修改门店利润计算方式，防止负数出现' (#176) from dev into main 
Reviewed-on: #176
 2024-08-31 21:22:54 +08:00
mkm
594efabae1 feat(CommissionProductLogic): 修改门店利润计算方式，防止负数出现 2024-08-31 21:15:15 +08:00
mkm
9250121560 Merge pull request 'dev' (#175) from dev into main 
Reviewed-on: #175
1.10.0 		2024-08-31 20:43:08 +08:00
mkm
7c5a651b3e feat(User): 移除冗余的onBeforeWrite和onAfterWrite方法，简化代码逻辑 2024-08-31 20:31:16 +08:00
mkm
1e03c45df2 1 2024-08-31 17:55:20 +08:00
mkm
e1ed493313 1 2024-08-31 17:22:25 +08:00
mkm
9dd5b83c34 feat(StoreOrderController): 添加计算总价功能并更新导出订单文件路径 2024-08-31 15:24:26 +08:00
mkm
c20da03e7c feat: 使用BusinessException异常处理支付回调和订单保存 2024-08-31 15:11:57 +08:00
mkm
d1203b48e5 feat(store_order): 添加余额支付和采购款支付的退款功能 2024-08-31 14:45:34 +08:00
mkm
5fd9781f49 feat: 修改IndexController类中的index方法，移除了更新用户余额的代码；增加了LoginAccountValidate类中的错误抛出异常，优化了PayNotifyLogic类中的代码逻辑，简化了User类中的日志记录方式，更新了log配置文件，修改了ModelEvent类中的代码。 2024-08-31 14:27:25 +08:00
mkm
975c5b232f 1 2024-08-30 17:59:41 +08:00
mkm
b3f9ef6dde Merge pull request 'feat: 优化业务逻辑和异常处理，提升系统安全性和稳定性' (#174) from dev into main 
Reviewed-on: #174
 2024-08-29 20:18:00 +08:00
mkm
7326ef78e3 feat: 优化业务逻辑和异常处理，提升系统安全性和稳定性 2024-08-29 20:15:21 +08:00
mkm
84b273c0b9 Merge pull request 'dev' (#173) from dev into main 
Reviewed-on: #173
 2024-08-29 19:52:04 +08:00
mkm
c25aef2197 feat: 添加搜索条件 'between_time' 和四个ID参数到 WarehouseOrderLists 类 2024-08-29 17:49:30 +08:00
mkm
4d1d2e0745 feat(CartList): 修改购物车列表查询限制和单位处理逻辑 2024-08-29 11:01:25 +08:00
mkm
f43ae475dd Merge pull request 'dev' (#172) from dev into main 
Reviewed-on: #172
 2024-08-28 20:39:33 +08:00
mkm
4a2378f15b feat(WarehouseProductStorege.php): 移除了商品库存更新日志记录 2024-08-28 20:39:02 +08:00
mkm
fc779f1e7e feat(UserLists.php): 添加'between_time'查询条件 2024-08-28 18:01:04 +08:00
mkm
a2b121462c feat: 添加修改商品状态的API接口 2024-08-28 16:43:08 +08:00
mkm
4cef86fb87 feat: 修改SystemStoreLists类以优化购物车商品库存查询逻辑 2024-08-28 15:47:22 +08:00
mkm
dc10bce200 Merge pull request 'feat: 修改商品库存更新逻辑，增加日志记录' (#171) from dev_two into dev 
Reviewed-on: #171
 2024-08-28 15:22:49 +08:00
mkm
b2baeec62c feat: 修改商品库存更新逻辑，增加日志记录 2024-08-28 15:21:55 +08:00
mkm
84f39f0ac7 feat(CartController): 增加购物车商品起批发量判断和修改 2024-08-28 11:09:24 +08:00
mkm
ed11d1f0e0 Merge pull request 'dev' (#170) from dev into main 
Reviewed-on: #170
 2024-08-27 21:11:18 +08:00
mkm
7967f0b9cd feat: 优化 IndexController 中的距离计算逻辑，提高代码可读性和性能 2024-08-27 21:10:13 +08:00