codeliu
|
74cbfef69e
|
修改逻辑
|
2024-03-23 11:48:03 +08:00 |
|
codeliu
|
953210ea9f
|
数据不对
|
2024-03-23 11:28:25 +08:00 |
|
|
|
428ee0f429
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev
|
2024-03-23 11:04:37 +08:00 |
|
|
|
454ede18f8
|
修改店铺券使用
|
2024-03-23 11:04:24 +08:00 |
|
codeliu
|
f59249a6ba
|
处理价格不在区间范围内但是又有设置的商品匹配返回
|
2024-03-23 10:54:53 +08:00 |
|
|
|
aac0774b9c
|
修改店铺券使用
|
2024-03-23 10:49:08 +08:00 |
|
|
|
1b6b2709a1
|
修改优惠券使用比例
|
2024-03-23 09:42:50 +08:00 |
|
codeliu
|
c0f71cf4a6
|
修改商户更替身份的店铺类型
|
2024-03-23 09:22:18 +08:00 |
|
codeliu
|
08c790fd18
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-22 17:53:47 +08:00 |
|
codeliu
|
bb1ac57e0c
|
扫码支付设置默认
|
2024-03-22 17:53:17 +08:00 |
|
|
|
677251b0f8
|
修改优惠券使用
|
2024-03-22 17:53:02 +08:00 |
|
|
|
09b800960e
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev
|
2024-03-22 17:44:29 +08:00 |
|
|
|
738880dff1
|
调整补贴发放
|
2024-03-22 17:44:08 +08:00 |
|
codeliu
|
faafdde06f
|
打开限制
|
2024-03-22 17:37:02 +08:00 |
|
codeliu
|
ce84c4c8aa
|
修改扫码商户下单限制
|
2024-03-22 17:00:49 +08:00 |
|
|
|
e371179faf
|
修改增收补贴列表
|
2024-03-22 16:57:42 +08:00 |
|
|
|
cdbf8cc0c9
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev
|
2024-03-22 16:28:06 +08:00 |
|
|
|
e55321b5f8
|
修改推荐商品列表
|
2024-03-22 16:28:01 +08:00 |
|
codeliu
|
76dab72a8e
|
扫码提货限制购物车会有检测限制
|
2024-03-22 16:22:59 +08:00 |
|
codeliu
|
1e37ca795d
|
修改支付下单主订单
|
2024-03-22 15:50:41 +08:00 |
|
|
|
4c279f2153
|
修改增收补贴发放的错误
|
2024-03-22 15:38:39 +08:00 |
|
|
|
50fe835c74
|
修改增收补贴发放的错误
|
2024-03-22 15:36:51 +08:00 |
|
|
|
2338f133a1
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev
|
2024-03-22 15:20:54 +08:00 |
|
|
|
157044ae9f
|
调整密码校验
|
2024-03-22 15:20:28 +08:00 |
|
codeliu
|
75ee72e389
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-22 15:18:22 +08:00 |
|
codeliu
|
2fadf3f8e0
|
修改支付下单金额逻辑
|
2024-03-22 15:18:04 +08:00 |
|
|
|
69ef10109f
|
更新
|
2024-03-22 15:17:12 +08:00 |
|
|
|
d1896638d5
|
修改增收补贴发放的错误
|
2024-03-22 15:04:28 +08:00 |
|
|
|
6874dab755
|
修改增收补贴发放的错误
|
2024-03-22 14:52:26 +08:00 |
|
|
|
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 |
|
