1529 Commits

Author SHA1 Message Date
4362d43795 Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store 2024-06-06 16:45:20 +08:00
359c015a15 添加配送员管理 2024-06-06 16:45:14 +08:00
liu
8eb46c9d08 订单数量 2024-06-06 16:42:35 +08:00
liu
0a67e0c090 修改下单优惠逻辑 2024-06-06 16:32:05 +08:00
liu
f591acf7ca 修改充值 2024-06-06 16:12:42 +08:00
mkm
5b27ec955f feat: 添加获取日、周、月账单列表API 2024-06-06 16:10:12 +08:00
fa4e005459 添加文件管理 2024-06-06 16:00:20 +08:00
2c6de7c547 添加文件管理 2024-06-06 15:55:35 +08:00
cf79b9e139 Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store 2024-06-06 15:47:20 +08:00
dc789c2f5e 修改订单列表查询 2024-06-06 15:47:13 +08:00
liu
7ce6403ce4 修改二次支付 2024-06-06 15:34:57 +08:00
8515960d83 添加店员管理 2024-06-06 15:00:33 +08:00
liu
73f6fe4032 修改收银台相关接口 2024-06-06 14:58:20 +08:00
mkm
56b7588e54 feat: 添加获取退款订单列表API 2024-06-06 14:38:11 +08:00
fbecb264d5 Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
# Conflicts:
#	public/admin/index.html
2024-06-06 14:22:29 +08:00
liu
04c186afe0 修改权限和限制核销健壮性 2024-06-06 14:15:42 +08:00
liu
04241cf26b 修改权限 2024-06-06 13:55:43 +08:00
liu
3da56c1612 补接口 2024-06-06 13:43:23 +08:00
liu
495c5ec3ea 修改查询方式 2024-06-06 11:57:07 +08:00
liu
c272041732 充值金额列表 2024-06-06 11:53:38 +08:00
liu
696f10ee2a 会员账户相关 2024-06-06 11:34:26 +08:00
mkm
48a54fcf5a feat(store_cash_finance_flow): 修改添加和删除方法,优化查询列表 2024-06-06 11:10:58 +08:00
98fb4d087c 添加现金支付记录 2024-06-06 11:02:56 +08:00
liu
4f0f91b61a 回调充值修改 2024-06-06 11:01:49 +08:00
liu
bae7a58f0e 回调加入资金流水 2024-06-06 10:59:27 +08:00
mkm
ec71741e53 feat: 订单列表添加产品店铺信息展示 2024-06-06 10:33:58 +08:00
496f20252a 修改订单统计查询 2024-06-06 10:31:54 +08:00
ab9338b2ba 修改财务流水备注 2024-06-06 10:14:17 +08:00
liu
2b7dc62b61 调试退款 2024-06-06 09:51:14 +08:00
liu
a8e0ec48ed 调试 2024-06-06 09:45:43 +08:00
cc842a9757 Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store 2024-06-06 09:45:03 +08:00
4ef8bf0097 添加财务流水备注 2024-06-06 09:44:53 +08:00
liu
695420b2fe 调试退款 2024-06-06 09:41:58 +08:00
748d9ea085 Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store 2024-06-06 09:36:30 +08:00
d24dc210ac 添加店员管理 2024-06-06 09:36:18 +08:00
liu
eea9603fbe Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store 2024-06-06 09:34:02 +08:00
liu
264921c45f 断点 2024-06-06 09:32:55 +08:00
0de65a8ff5 Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store 2024-06-06 09:26:24 +08:00
f8e43a114c 修改财务流水列表 2024-06-06 09:26:18 +08:00
mkm
73dece7237 feat: 移除json字符串转换为数组操作 2024-06-06 09:24:31 +08:00
liuchaofu
07103bbf65 会员等级 2024-06-05 23:00:13 +08:00
liuchaofu
cfed701649 核销码查数据 2024-06-05 22:47:49 +08:00
liu
750f54b453 等级和调用支付 2024-06-05 18:44:18 +08:00
liu
cf4fc46757 Merge remote-tracking branch 'origin/main' 2024-06-05 18:39:21 +08:00
liu
9a9c836f34 等级和调用支付 2024-06-05 18:39:11 +08:00
9ee89dcc11 Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store 2024-06-05 18:10:10 +08:00
80e8ae9bf8 Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
# Conflicts:
#	app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php
2024-06-05 18:09:57 +08:00
mkm
217e5b15b7 feat(StoreFinanceFlowLists): 修改了'store_id'和'user_id'的搜索键名为'uid' 2024-06-05 18:09:42 +08:00
mkm
a1219b9d30 feat: 添加了对GIF图像的编码和解码支持 2024-06-05 18:07:46 +08:00
be1e3067ec 修改财务流水写入 2024-06-05 18:07:34 +08:00