|
|
cc51dc8742
|
Merge branch 'feature/purchase_record' into dev
|
2023-07-05 16:11:27 +08:00 |
|
|
|
5e9b8d6968
|
调试商品库存入库
|
2023-07-05 16:10:00 +08:00 |
|
|
|
2674ac7984
|
Merge branch 'feature/purchase_record' into dev
|
2023-07-05 11:41:56 +08:00 |
|
|
|
28280cccd2
|
调试信用购订单
|
2023-07-05 11:41:47 +08:00 |
|
|
|
f9b1d4fd9d
|
Merge branch 'feature/purchase_record' into dev
|
2023-07-05 10:05:02 +08:00 |
|
|
|
42c12a256e
|
信用购订单结算后，金额转入卖家
|
2023-07-05 10:04:33 +08:00 |
|
|
|
32904dd6dd
|
添加信用购订单逾期定时通知
|
2023-07-04 17:47:42 +08:00 |
|
|
|
5ac9ce5b1d
|
Merge branch 'feature/push' into feature/purchase_record
|
2023-07-04 17:30:51 +08:00 |
|
|
|
fa52db4890
|
Merge branch 'master' into feature/purchase_record
# Conflicts:
# vendor/composer/installed.php
|
2023-07-04 16:50:13 +08:00 |
|
|
|
7fbfffbc30
|
Merge branch 'feature/purchase_record' into dev
|
2023-07-04 14:44:17 +08:00 |
|
|
|
eda3d4538f
|
修改定时冻结商户提现任务
|
2023-07-04 14:43:57 +08:00 |
|
|
|
758687c8bd
|
Merge branch 'feature/purchase_record' into dev
# Conflicts:
# vendor/composer/installed.php
|
2023-07-04 14:42:00 +08:00 |
|
|
|
69c339fc5a
|
信用购订单逾期，冻结商户提现，结算后恢复提现
|
2023-07-04 14:39:52 +08:00 |
|
|
|
01df202cb7
|
信用购订单添加确认接单
|
2023-07-04 11:13:39 +08:00 |
|
|
|
970d075384
|
Merge branch 'feature/push' into dev
|
2023-07-01 16:14:25 +08:00 |
|
|
|
315c87c754
|
调试极光推送
|
2023-07-01 16:14:09 +08:00 |
|
|
|
7c759fdaf6
|
Merge branch 'feature/push' into dev
|
2023-07-01 15:06:18 +08:00 |
|
|
|
a54e837d74
|
调试极光消息推送
|
2023-07-01 15:06:03 +08:00 |
|
|
|
0b4dcf19ea
|
调试采购商品信用购
|
2023-07-01 13:51:35 +08:00 |
|
|
|
be8ff6ed03
|
Merge branch 'feature/push' into dev
|
2023-06-30 17:28:06 +08:00 |
|
|
|
52ef67b76b
|
调试极光推送
|
2023-06-30 17:27:43 +08:00 |
|
|
|
8f522e588d
|
添加极光push
|
2023-06-29 13:52:40 +08:00 |
|
|
|
55c4ab94a1
|
调整订单结算后的利息展示
|
2023-06-29 13:48:22 +08:00 |
|
|
|
982e81f30f
|
添加极光push SDK
|
2023-06-28 16:45:48 +08:00 |
|
|
|
c67d617fe6
|
调试信用购订单结算
|
2023-06-28 15:26:01 +08:00 |
|
|
|
b4be5a65b4
|
订单确认收货，写入计息数据
|
2023-06-27 17:59:35 +08:00 |
|
|
|
10d3db55ff
|
采购订单允许多个商品
|
2023-06-27 15:25:47 +08:00 |
|
|
|
7115792191
|
订单添加信用购
|
2023-06-27 10:54:15 +08:00 |
|
|
|
11ba0dc8d3
|
添加商品采购入库
|
2023-06-26 14:44:29 +08:00 |
|
|
|
fa730cf99f
|
Merge branch 'master' of git.excellentkk.cn:mkm/shop-php
|
2023-06-20 17:22:25 +08:00 |
|
|
|
482d6849a4
|
提交
|
2023-06-20 17:22:23 +08:00 |
|
|
|
d524565ce1
|
处理订单改价的错误
|
2023-06-20 13:41:20 +08:00 |
|
|
|
18a36649dd
|
Merge pull request '修复订单保证金退款的错误' (#14) from dev into master
Reviewed-on: http://git.excellentkk.cn/mkm/shop-php/pulls/14
|
2023-06-19 17:28:23 +08:00 |
|
|
|
6dec5a1879
|
修改订单退款金额
|
2023-06-19 14:57:58 +08:00 |
|
|
|
8d65a3566a
|
修改商品上架的错误
|
2023-06-19 13:49:40 +08:00 |
|
|
|
f3fbb46b49
|
调整订单退款的错误
|
2023-06-19 11:42:56 +08:00 |
|
|
|
96255e2b0e
|
修改账单统计的错误
|
2023-06-17 16:11:47 +08:00 |
|
|
|
c0d82f8fe5
|
Merge pull request 'dev' (#13) from dev into master
Reviewed-on: http://git.excellentkk.cn/mkm/shop-php/pulls/13
|
2023-06-15 14:45:35 +08:00 |
|
|
|
06b5715403
|
Merge branch 'master' into dev
|
2023-06-15 14:40:24 +08:00 |
|
|
|
ba37887bc9
|
调整短信验证码
|
2023-06-14 14:34:03 +08:00 |
|
|
|
cc2d406b31
|
佣金或保证金为0时不写入记录
|
2023-06-14 14:06:29 +08:00 |
|
|
|
7cfad29399
|
调整文章录入限制
v1.0
|
2023-06-14 11:24:24 +08:00 |
|
|
|
8e5b2fa121
|
修改店铺云商品列表的错误
|
2023-06-14 10:28:38 +08:00 |
|
|
|
feeac438bf
|
修改店铺云商品列表的错误
|
2023-06-13 18:04:59 +08:00 |
|
|
|
b4ef286e4e
|
调整商户冻结金额入账
|
2023-06-13 17:44:15 +08:00 |
|
|
|
e95bf1e6e7
|
调整提现申请
|
2023-06-13 16:37:21 +08:00 |
|
|
|
f68b344e6e
|
修改店铺云商品列表的错误
|
2023-06-13 16:32:16 +08:00 |
|
|
|
4812a2a51b
|
修改店铺云商品列表的错误
|
2023-06-13 16:31:12 +08:00 |
|
|
|
899e8164fb
|
调试提现
|
2023-06-13 14:33:55 +08:00 |
|
|
|
3dda5021a9
|
修改佣金计算的错误
|
2023-06-13 14:27:38 +08:00 |
|
