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

2461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mkm
3a100dc662 feat: 添加预订单表和预订单购物详情表的API接口 2024-09-30 16:44:47 +08:00
mkm
08f0875c21 Merge pull request 'feat: 调整零售会员利润计算条件' (#237) from cc into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/237
 2024-09-30 10:37:35 +08:00
mkm
9da0f8942d feat: 调整零售会员利润计算条件 2024-09-30 10:36:41 +08:00
mkm
f042b73e76 Merge pull request 'cc' (#236) from cc into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/236
 2024-09-28 20:20:46 +08:00
mkm
189964de00 feat: 修改零售会员利润计算逻辑 2024-09-28 16:37:03 +08:00
mkm
2ce312d7f8 feat: 修改零售会员利润计算逻辑 2024-09-28 16:28:47 +08:00
mkm
e58b0fbac5 feat: 增加onBeforeWrite和onAfterWrite方法在StoreFinanceFlow和SystemStore模型中以记录更新前后的日志 2024-09-28 15:32:31 +08:00
mkm
2a17dde78d feat: 修改订单逻辑，引入保证金逻辑，调整门店利润计算方式 2024-09-28 14:58:04 +08:00
mkm
12e214d8ca Merge pull request 'cc' (#235) from cc into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/235
 2024-09-28 11:07:54 +08:00
mkm
bb562f86ee feat: 更新了异常处理机制，优化了代码结构 2024-09-28 10:54:09 +08:00
mkm
218aa8c23f feat: 修改会员利润计算逻辑 2024-09-28 09:48:04 +08:00
mkm
a0bc922207 feat: 修改了订单相关的API逻辑，移除了不必要的经纬度参数，并优化了成本计算方式。 2024-09-28 09:24:54 +08:00
mkm
e2e470d092 feat: 添加店铺收支API功能 2024-09-27 18:16:07 +08:00
mkm
362c348140 feat(OrderController, StoreOrderController): 移除系统维护暂停交易提示，优化订单API 2024-09-26 21:29:19 +08:00
mkm
5e13b684a8 feat(OrderController): 在订单API中增加系统维护暂停交易提示 2024-09-26 21:20:57 +08:00
mkm
4e2fcf669f feat: 添加门店入库功能 2024-09-26 17:21:44 +08:00
mkm
8a66d91620 feat(system_store_storage): 添加商品入库API功能 2024-09-26 11:38:54 +08:00
mkm
b65ce4717a feat: 重构了退款逻辑，优化了代码结构 2024-09-26 10:56:02 +08:00
mkm
0a0da1cf6b Merge pull request 'cc' (#234) from cc into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/234
 2024-09-25 22:25:34 +08:00
mkm
6ffd57704b feat(StoreController): 更新店铺菜单链接，添加店铺收支导航功能 2024-09-25 22:24:30 +08:00
mkm
0b42d7553a feat(BranchProductLists): 根据请求参数调整商品列表API，增加库存和销售字段，修复查询逻辑 2024-09-25 20:45:48 +08:00
mkm
21baf23272 feat: 修改商品列表API，增加'total_price'字段，修复'is_lack'判断逻辑 2024-09-25 17:59:54 +08:00
mkm
64396fe1b5 feat: 添加了根据订单ID获取订单详细信息的功能 2024-09-25 17:40:46 +08:00
mkm
1d8e9a9a36 feat(menu): 更新店铺菜单链接 2024-09-23 18:45:57 +08:00
mkm
4b321b703d Merge pull request 'feat: 增加小程序导航功能' (#233) from cc into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/233
 2024-09-23 15:21:21 +08:00
mkm
a8f1887b45 feat: 增加小程序导航功能 2024-09-23 15:14:09 +08:00
mkm
4c756a1387 Merge pull request 'feat(WarehouseOrderController): 更新仓库订单查询方法，加入软删除功能' (#232) from cc into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/232
 2024-09-22 12:00:55 +08:00
mkm
0c485b8433 feat(WarehouseOrderController): 更新仓库订单查询方法，加入软删除功能 2024-09-22 12:00:36 +08:00
mkm
f3598de7db Merge pull request 'feat: 使用withTrashed方法查询带删除标记的产品信息' (#231) from cc into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/231
 2024-09-22 11:45:55 +08:00
mkm
04eabec632 feat: 使用withTrashed方法查询带删除标记的产品信息 2024-09-22 11:45:25 +08:00
mkm
2454cf65a3 Merge pull request 'feat: 修改了支付逻辑以支持浮点数金额' (#230) from cc into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/230
 2024-09-21 21:45:56 +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: https://gitea.lihaink.cn/mkm/multi-store/pulls/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: https://gitea.lihaink.cn/mkm/multi-store/pulls/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: https://gitea.lihaink.cn/mkm/multi-store/pulls/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: https://gitea.lihaink.cn/mkm/multi-store/pulls/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: https://gitea.lihaink.cn/mkm/multi-store/pulls/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: https://gitea.lihaink.cn/mkm/multi-store/pulls/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: https://gitea.lihaink.cn/mkm/multi-store/pulls/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: https://gitea.lihaink.cn/mkm/multi-store/pulls/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: https://gitea.lihaink.cn/mkm/multi-store/pulls/221
 2024-09-19 22:56:12 +08:00