|
677018f672
|
更新
|
2024-01-31 11:44:35 +08:00 |
|
|
95dfb48ce9
|
更新
|
2024-01-31 11:03:00 +08:00 |
|
|
76957dec1d
|
更新
|
2024-01-31 10:33:36 +08:00 |
|
|
d0e87bcb00
|
更新查询
|
2024-01-30 18:28:52 +08:00 |
|
|
5fe3177046
|
Merge branch 'optimize' into dev
|
2024-01-30 17:49:24 +08:00 |
|
|
62d7afee3c
|
调整商品审核 的错误
|
2024-01-30 17:49:15 +08:00 |
|
|
450c5f8300
|
修改活动用户数据写入的错误
|
2024-01-30 17:11:05 +08:00 |
|
|
2015422c5d
|
调整活动订单有效金额查询
|
2024-01-30 17:05:41 +08:00 |
|
|
f53d5f8f24
|
调整退还红包的错误
|
2024-01-30 16:23:59 +08:00 |
|
|
2194197d6b
|
红包活动,未选择默认消费补贴
|
2024-01-30 14:36:04 +08:00 |
|
|
19cbb37def
|
优化财务流水写入
|
2024-01-30 14:13:10 +08:00 |
|
|
3626181717
|
优化财务流水写入
|
2024-01-30 14:10:53 +08:00 |
|
|
be06847e9a
|
修改新供销平台域名
|
2024-01-30 14:04:13 +08:00 |
|
|
38157d4bbb
|
优化财务流水写入
|
2024-01-30 13:56:27 +08:00 |
|
|
f5aaee07e1
|
优化财务流水写入
|
2024-01-30 11:39:10 +08:00 |
|
|
ccbffc730e
|
添加店铺直推佣金
|
2024-01-29 18:04:07 +08:00 |
|
|
64d6de80cf
|
订单退款,店铺退佣金,服务团队退佣金和红包
|
2024-01-29 16:46:32 +08:00 |
|
|
f6b212da22
|
订单退款,退用户红包,撤销活动订单
|
2024-01-29 14:55:11 +08:00 |
|
|
665eb57c5e
|
修改订单红包金额分配的错误
|
2024-01-29 14:03:35 +08:00 |
|
|
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 |
|
|
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 |
|
|
85becee5f8
|
Merge branch 'master' into dev
# Conflicts:
# app/common/dao/store/StoreActivityDao.php
|
2024-01-27 17:47:23 +08:00 |
|
|
f4c83b013a
|
修改订单支付回调的错误
|
2024-01-27 17:30:29 +08:00 |
|
|
98697a31eb
|
修改活动商品列表
|
2024-01-27 16:55:55 +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 |
|
|
f63c223506
|
调整退款金额的错误
|
2024-01-26 17:05:00 +08:00 |
|
|
2941a39035
|
调整活动商品限购
|
2024-01-26 15:05:40 +08:00 |
|
|
d1b2a3abd2
|
修复状态
|
2024-01-26 14:52:35 +08:00 |
|
|
9e71b720e5
|
添加判断
|
2024-01-26 14:06:56 +08:00 |
|
|
b05cf35972
|
修复
|
2024-01-26 13:52:43 +08:00 |
|
|
4c09bdee16
|
调整活动商品限购
|
2024-01-26 13:52:15 +08:00 |
|
|
fe119cf1a1
|
修改佣金写入的错误
|
2024-01-26 12:03:07 +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 |
|
|
de13db05a2
|
修改订单佣金日志写入的错误
|
2024-01-25 16:35:47 +08:00 |
|
|
8c308fd431
|
更新云仓上下架
|
2024-01-25 15:23:47 +08:00 |
|