|
|
cf1a38ea0f
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev
# Conflicts:
# app/common/repositories/store/order/StoreOrderRepository.php
|
2024-03-22 12:08:35 +08:00 |
|
|
|
4282a50d18
|
修改订单统计
|
2024-03-22 12:04:56 +08:00 |
|
liu
|
19087229e4
|
修改返回格式
|
2024-03-22 11:59:48 +08:00 |
|
liu
|
618f9c3831
|
用户佣金
|
2024-03-22 11:09:43 +08:00 |
|
|
|
46141c5d41
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev
|
2024-03-22 11:02:43 +08:00 |
|
|
|
339cade7cc
|
调整支付校验
|
2024-03-22 11:02:08 +08:00 |
|
liu
|
b3e2bfc0a9
|
商户冻结资金列表和提前解冻
|
2024-03-22 10:27:11 +08:00 |
|
|
|
454eca8c1d
|
修改优惠券详情的错误
|
2024-03-22 10:02:58 +08:00 |
|
|
|
ba61566ae8
|
修改商品匹配的错误
|
2024-03-22 09:40:18 +08:00 |
|
|
|
e25473971a
|
修改商品匹配的错误
|
2024-03-21 17:40:03 +08:00 |
|
|
|
f9caf19c5e
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev
|
2024-03-21 17:24:17 +08:00 |
|
|
|
49fa0bcd76
|
修改补贴金额的错误
|
2024-03-21 17:24:00 +08:00 |
|
liu
|
644e7d520c
|
对公转账二次支付
|
2024-03-21 17:20:15 +08:00 |
|
|
|
de9a758c22
|
调整补贴列表
|
2024-03-21 16:46:57 +08:00 |
|
|
|
c2d6ece975
|
调整补贴列表
|
2024-03-21 16:37:43 +08:00 |
|
|
|
541990a1b2
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev
|
2024-03-21 16:19:26 +08:00 |
|
|
|
8e72121a32
|
调整补贴列表
|
2024-03-21 16:19:21 +08:00 |
|
liu
|
aed6a946a3
|
参数接受修改
|
2024-03-21 15:52:46 +08:00 |
|
liu
|
b3408a8ff5
|
处理代码缺失
|
2024-03-21 15:46:46 +08:00 |
|
liu
|
473314def9
|
整合商户信息
|
2024-03-21 14:40:59 +08:00 |
|
liu
|
6674cd6b28
|
审核人员默认头像
|
2024-03-21 13:42:48 +08:00 |
|
|
|
2b732fb5f4
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev
|
2024-03-21 11:53:44 +08:00 |
|
|
|
60f335f44c
|
修改后台订单统计
|
2024-03-21 11:53:39 +08:00 |
|
liu
|
19b1cde138
|
返回商户头像,只有审核通过更改
|
2024-03-21 11:48:27 +08:00 |
|
liu
|
de32a8dc0e
|
修改状态
|
2024-03-21 11:31:16 +08:00 |
|
|
|
db53121924
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev
|
2024-03-21 11:29:54 +08:00 |
|
|
|
76a8afe6cd
|
添加校验支付密码
|
2024-03-21 11:29:49 +08:00 |
|
liu
|
7a86d42aa5
|
审核后直接显示并且上架
|
2024-03-21 11:27:33 +08:00 |
|
liu
|
dc7c90d466
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev
|
2024-03-21 10:58:07 +08:00 |
|
liu
|
1a75f8fec9
|
后台审核更新商户
|
2024-03-21 10:57:50 +08:00 |
|
|
|
f7dcde9937
|
添加优惠券拒绝领取
|
2024-03-21 10:34:04 +08:00 |
|
|
|
ca07bd58a8
|
暂时关闭支付密码校验
|
2024-03-21 10:28:34 +08:00 |
|
|
|
ff2d4582b2
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev
|
2024-03-21 10:23:49 +08:00 |
|
|
|
4064e7e9fe
|
修改支付密码校验
|
2024-03-21 10:23:36 +08:00 |
|
liu
|
c415e94f88
|
审核列表接口和后台申请限制
|
2024-03-21 10:21:45 +08:00 |
|
|
|
6748227b4f
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev
|
2024-03-21 10:04:08 +08:00 |
|
|
|
2aa0325af7
|
调整补贴列表
|
2024-03-21 10:04:03 +08:00 |
|
|
|
9d4e91bf72
|
更新
|
2024-03-21 09:50:25 +08:00 |
|
|
|
1dd46946f5
|
修改订单数量统计
|
2024-03-21 09:40:38 +08:00 |
|
|
|
00b31013a1
|
添加支付密码校验
|
2024-03-20 17:38:27 +08:00 |
|
|
|
d404fc4ed2
|
修改补贴发放
|
2024-03-20 17:02:15 +08:00 |
|
|
|
c2d875b6b7
|
修改补贴金额展示的错误
|
2024-03-20 16:51:00 +08:00 |
|
|
|
c518d87b39
|
修改补贴金额的错误
|
2024-03-20 16:38:50 +08:00 |
|
|
|
5af33cdc7d
|
修改订单数量统计的错误
|
2024-03-20 16:19:30 +08:00 |
|
|
|
15131252f1
|
修改商户入驻申请审核
|
2024-03-20 16:03:17 +08:00 |
|
|
|
d7663328ac
|
调整订单默认配送方式
|
2024-03-20 15:48:17 +08:00 |
|
|
|
55968578cf
|
修改扫码商品获取
|
2024-03-20 15:33:47 +08:00 |
|
|
|
e51561a7cb
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev
|
2024-03-20 15:29:52 +08:00 |
|
|
|
373cd3a5dc
|
修改扫码商品获取
|
2024-03-20 15:29:48 +08:00 |
|
|
|
8310d742c7
|
更新
|
2024-03-20 13:34:06 +08:00 |
|
