|
|
66130c66d2
|
镇合伙人直推奖励抵扣红包
|
2024-01-29 11:10:16 +08:00 |
|
|
|
d738995aef
|
调整佣金发放和首单判断
|
2024-01-29 11:03:51 +08:00 |
|
|
|
c015a8f00c
|
删除halt
|
2024-01-28 17:18:57 +08:00 |
|
|
|
f0d95a4d94
|
更新自动向市级供应链创建订单判断
|
2024-01-28 17:13:49 +08:00 |
|
|
|
fb5d12d93c
|
删除支付后的活动商品判断
|
2024-01-28 15:57:49 +08:00 |
|
|
|
d6a56e119f
|
更新商品编辑
|
2024-01-28 14:03:06 +08:00 |
|
|
|
7adac8fb8b
|
更新
|
2024-01-28 11:55:13 +08:00 |
|
|
|
23d1affda5
|
更新
|
2024-01-28 11:54:43 +08:00 |
|
|
|
85becee5f8
|
Merge branch 'master' into dev
# Conflicts:
# app/common/dao/store/StoreActivityDao.php
|
2024-01-27 17:47:23 +08:00 |
|
|
|
2b34014065
|
Merge pull request '修改订单支付回调的错误' (#144) from hot_fix into master
Reviewed-on: #144
|
2024-01-27 17:30:58 +08:00 |
|
|
|
f4c83b013a
|
修改订单支付回调的错误
|
2024-01-27 17:30:29 +08:00 |
|
|
|
98fa70294c
|
Merge pull request '修改活动商品列表' (#143) from hot_fix into master
Reviewed-on: #143
|
2024-01-27 16:56:29 +08:00 |
|
|
|
98697a31eb
|
修改活动商品列表
|
2024-01-27 16:55:55 +08:00 |
|
|
|
aeeddbd222
|
登录接口返回是否新用户
|
2024-01-27 16:11:09 +08:00 |
|
|
|
5a19b17354
|
Merge pull request '修改活动商品列表' (#142) from hot_fix into master
Reviewed-on: #142
|
2024-01-27 14:36:39 +08:00 |
|
|
|
4b4449fbe5
|
修改活动商品列表
|
2024-01-27 14:33:55 +08:00 |
|
|
|
dddfaada87
|
调整活动商品列表
|
2024-01-27 14:23:42 +08:00 |
|
|
|
db17dd9bc1
|
修改订单金额的错误
|
2024-01-27 10:32:46 +08:00 |
|
|
|
529c2cbd1a
|
修改订单金额的错误
|
2024-01-27 10:18:34 +08:00 |
|
|
|
ba205d9954
|
处理回收站商品删除的错误
|
2024-01-27 09:40:06 +08:00 |
|
|
|
a09dc031b3
|
修改订单金额的错误
|
2024-01-26 18:07:49 +08:00 |
|
|
|
19c9cf3c3b
|
修改订单金额的错误
|
2024-01-26 18:01:29 +08:00 |
|
|
|
67131a8e5a
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev
|
2024-01-26 17:05:06 +08:00 |
|
|
|
f63c223506
|
调整退款金额的错误
|
2024-01-26 17:05:00 +08:00 |
|
|
|
1986b6a1cc
|
更新查询
|
2024-01-26 17:01:44 +08:00 |
|
|
|
66a30f717d
|
Merge pull request '调整活动商品限购' (#141) from dev into master
Reviewed-on: #141
|
2024-01-26 15:06:13 +08:00 |
|
|
|
2941a39035
|
调整活动商品限购
|
2024-01-26 15:05:40 +08:00 |
|
|
|
42b442bc51
|
Merge pull request '修复状态' (#140) from dev into master
Reviewed-on: #140
|
2024-01-26 14:59:49 +08:00 |
|
|
|
d1b2a3abd2
|
修复状态
|
2024-01-26 14:52:35 +08:00 |
|
|
|
bcefea436d
|
Merge pull request '更新' (#139) from dev into master
Reviewed-on: #139
|
2024-01-26 14:27:31 +08:00 |
|
|
|
4552f1b9c1
|
更新
|
2024-01-26 14:27:07 +08:00 |
|
|
|
697694e887
|
Merge pull request '添加判断' (#138) from dev into master
Reviewed-on: #138
|
2024-01-26 14:13:39 +08:00 |
|
|
|
9e71b720e5
|
添加判断
|
2024-01-26 14:06:56 +08:00 |
|
|
|
02307dcf3a
|
Merge pull request 'dev' (#137) from dev into master
Reviewed-on: #137
|
2024-01-26 13:55:13 +08:00 |
|
|
|
b05cf35972
|
修复
|
2024-01-26 13:52:43 +08:00 |
|
|
|
4c09bdee16
|
调整活动商品限购
|
2024-01-26 13:52:15 +08:00 |
|
|
|
f7d392381e
|
Merge pull request 'dev' (#136) from dev into master
Reviewed-on: #136
|
2024-01-26 12:03:45 +08:00 |
|
|
|
fe119cf1a1
|
修改佣金写入的错误
|
2024-01-26 12:03:07 +08:00 |
|
|
|
b75419a20f
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev
|
2024-01-26 11:49:08 +08:00 |
|
|
|
7bdceae628
|
添加日志
|
2024-01-26 11:48:54 +08:00 |
|
|
|
ecdee7b4d6
|
Merge pull request 'dev' (#135) from dev into master
Reviewed-on: #135
|
2024-01-26 11:40:51 +08:00 |
|
|
|
f4933fa33c
|
更新订单查询
|
2024-01-26 11:40:32 +08:00 |
|
|
|
eb30849646
|
修改活动商品库存的错误
|
2024-01-26 11:37:25 +08:00 |
|
|
|
2dd1348c37
|
更新权限
|
2024-01-26 09:39:36 +08:00 |
|
|
|
e2eb6d27c5
|
Merge branch 'master' of https://gitea.lihaink.cn/mkm/shop-php
Conflicts:
app/common/dao/store/StoreActivityDao.php
|
2024-01-26 09:39:11 +08:00 |
|
|
|
92061aeaf8
|
更新
|
2024-01-25 17:25:22 +08:00 |
|
|
|
5490cb5447
|
更新
|
2024-01-25 17:18:43 +08:00 |
|
|
|
2be1a456b9
|
更新
|
2024-01-25 17:11:33 +08:00 |
|
|
|
de13db05a2
|
修改订单佣金日志写入的错误
|
2024-01-25 16:35:47 +08:00 |
|
|
|
8c308fd431
|
更新云仓上下架
|
2024-01-25 15:23:47 +08:00 |
|
