996 Commits

Author SHA1 Message Date
mkm
dbeaf6d96a feat: 增加财务日志记录功能 2024-06-27 17:40:03 +08:00
mkm
6cb0bb359a feat: 修改订单逻辑和门店财务流水逻辑以优化核销流程 2024-06-27 17:28:10 +08:00
mkm
5113989f7b feat: 修改了 StoreProductLists.php 中的查询方法,使其更加灵活。 2024-06-27 17:13:48 +08:00
mkm
fef754e25a feat: 修改订单核销逻辑,增加核销后更新门店余额功能 2024-06-27 16:57:16 +08:00
mkm
911c8de446 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-27 16:38:11 +08:00
mkm
6238c1d594 feat: 增加订单推送功能,优化充值金额限制 2024-06-27 16:38:00 +08:00
liu
cf3dc5d259 修改门店收款逻辑的操作 2024-06-27 16:12:02 +08:00
liu
10ed5f432c 老数据兼容处理 2024-06-27 16:01:13 +08:00
liu
abd9e2cb82 更新复制和推送数据 2024-06-27 15:41:50 +08:00
liu
a944e9936f 修改分类同步小程序分类相关 2024-06-27 15:37:04 +08:00
mkm
28c94be5c9 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-27 15:33:42 +08:00
mkm
855c600f2b feat(PayNotifyLogic): 添加新功能,推送新订单信息至指定URL 2024-06-27 15:33:35 +08:00
liu
b95964cbaf 小程序分类修改表存储逻辑相关 2024-06-27 15:26:34 +08:00
mkm
eff3a9a2c6 feat(StoreFinanceFlow): 修改财务流水的统计方式,按年份和月份或按周显示收入和支出 2024-06-27 15:13:54 +08:00
mkm
3a80a09c83 feat(StoreFinanceFlowDayLists): 修正财务流水日列表查询语句 2024-06-27 15:12:04 +08:00
mkm
300b6b4bb2 feat(StoreFinanceFlowDayLists): 修改收入计算逻辑增加财务类型判断 2024-06-27 15:09:14 +08:00
mkm
02f747c8b9 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-27 14:35:18 +08:00
mkm
98996fa802 feat(UserLabelLists): 添加用户标签列表功能 2024-06-27 14:35:14 +08:00
liu
dfd12a6ea1 总后台查询订单相关数据逻辑 2024-06-27 14:29:55 +08:00
mkm
72c64d29d9 feat: 修改了商店控制器以从参数中获取价格 2024-06-27 14:26:39 +08:00
mkm
194db4c3df feat: 更新用户等级和余额核销逻辑 2024-06-27 14:21:02 +08:00
mkm
b812b36e3e feat: 修改了StoreProductLists.php, LoginLogic.php, OperationLogMiddleware.php, IndexController.php, OrderEnum.php, CommissionLogic.php, StoreFinanceFlowLogic.php, StoreOrderController.php, middleware.php等文件 2024-06-27 13:46:42 +08:00
liu
c644ff5a62 修改后台商品查询的缺失代码 2024-06-27 10:32:49 +08:00
liu
a40041e2df 退款退积分相关逻辑新增,减库存兼容核销 2024-06-27 10:26:06 +08:00
mkm
8c9608f5da Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-27 09:51:20 +08:00
mkm
7b5a2e76d4 feat: 增加用户真实姓名显示功能 2024-06-27 09:51:15 +08:00
liu
88d8a22241 门店余额消费新增 2024-06-27 09:42:54 +08:00
mkm
149afec11f feat(StoreFinanceFlowLists): 添加了财务类型和财务方式的搜索条件 2024-06-27 09:30:35 +08:00
mkm
6478f0f86e feat: 修改支付逻辑以处理不同支付方式 2024-06-26 21:07:30 +08:00
liu
f6e43fc75d 调换顺序 2024-06-26 20:01:25 +08:00
liu
2c461bf4e6 修改校验 2024-06-26 19:58:06 +08:00
liu
5a4bd318d2 修改微信回调逻辑 2024-06-26 19:52:02 +08:00
mkm
8804ccef93 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-26 19:41:33 +08:00
mkm
55c72dcd4d feat: 新增用户标签和 Shipping 信息功能 2024-06-26 19:41:27 +08:00
liu
255f99ea60 修改回调 2024-06-26 19:41:01 +08:00
mkm
1369f195a1 feat: 移除了重复的OrderLogic引用 2024-06-26 19:06:31 +08:00
mkm
525fa7292f Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-26 18:55:25 +08:00
mkm
130e736cae Merge remote-tracking branch 'origin/main' into dev 2024-06-26 18:55:12 +08:00
liu
9a0cd3bd4c 保留2位小数 2024-06-26 18:37:37 +08:00
liu
c5a21a867b 限制小程序查询数据 2024-06-26 18:32:27 +08:00
liu
eb0aa5b6fc 修改报错返回格式 2024-06-26 18:27:36 +08:00
liu
302499033c Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-26 18:12:45 +08:00
liu
00e8d3e1a6 收银机用户字段新增 2024-06-26 18:12:35 +08:00
mkm
7f2eb11b55 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-26 18:07:50 +08:00
mkm
7f78621b66 feat: 增加对空验证码的判断逻辑 2024-06-26 18:07:45 +08:00
liu
9cd1395a0a 新增报错提示 2024-06-26 18:07:37 +08:00
mkm
69cc28c0d4 feat(StoreOrderController): 修改writeoff_list方法获取页码和每页显示数量的来源 2024-06-26 18:06:02 +08:00
mkm
a54eebddb6 feat(StoreOrderLogic): 修改了StoreOrderLogic,移除了在线订单的物流方式查询条件,增加了分页查询功能。 2024-06-26 18:02:23 +08:00
mkm
9346c581b3 feat: 实现线下分润逻辑 2024-06-26 17:55:46 +08:00
liu
85eea99558 修改充值接口 2024-06-26 17:33:11 +08:00