2644 Commits

Author SHA1 Message Date
4463fb9daf 修改待付款订单列表 2023-07-08 10:41:22 +08:00
5009e22c7c Merge branch 'feature/purchase_record' into dev 2023-07-08 10:19:04 +08:00
c51850a61d 修改待付款订单列表 2023-07-08 10:18:55 +08:00
c3418e5c07 Merge branch 'feature/purchase_record' into dev 2023-07-07 17:12:44 +08:00
1e4be9da6f 修改采购订单列表查询 2023-07-07 17:12:34 +08:00
35a7a383c8 Merge branch 'feature/purchase_record' into dev 2023-07-07 16:58:21 +08:00
cc2ae7d4a2 修改采购订单列表查询 2023-07-07 16:58:08 +08:00
eea968cff9 Merge branch 'feature/purchase_record' into dev 2023-07-07 16:23:42 +08:00
7b73e904af 修改采购订单列表查询 2023-07-07 16:23:32 +08:00
771ac63b74 Merge branch 'feature/purchase_record' into dev 2023-07-07 11:24:09 +08:00
69040442c4 调整提现提示语 2023-07-07 11:24:00 +08:00
42dbf066c4 Merge branch 'feature/purchase_record' into dev 2023-07-07 11:07:50 +08:00
13884d15ca 信用购订单支持多商品 2023-07-07 11:07:41 +08:00
fd4f98f756 Merge branch 'feature/purchase_record' into dev 2023-07-07 10:54:33 +08:00
75e69d505e 调试信用购订单监控 2023-07-07 10:54:24 +08:00
870f9915e0 Merge branch 'feature/purchase_record' into dev 2023-07-07 10:27:48 +08:00
0f1a8e908f 调试信用购订单监控 2023-07-07 10:27:39 +08:00
0666886a47 Merge branch 'feature/purchase_record' into dev 2023-07-07 10:20:13 +08:00
59242d49ac 调试信用购订单监控 2023-07-07 10:19:46 +08:00
a27810f9df Merge branch 'feature/purchase_record' into dev 2023-07-06 15:36:57 +08:00
ff5fe1e2cd 调试信用购订单确认 2023-07-06 15:36:49 +08:00
f110fc7d7a Merge branch 'feature/purchase_record' into dev 2023-07-06 14:45:34 +08:00
64516b41d4 修改订单结算路由 2023-07-06 14:44:17 +08:00
5244039650 Merge branch 'feature/purchase_record' into dev 2023-07-06 13:59:52 +08:00
efaf48186b 调试信用购订单结算回调 2023-07-06 13:59:40 +08:00
41c949972b Merge branch 'feature/purchase_record' into dev 2023-07-06 12:00:07 +08:00
c0e1a39c1e 调试信用购订单支付回调 2023-07-06 11:59:55 +08:00
5962883929 Merge branch 'feature/purchase_record' into dev 2023-07-06 11:29:08 +08:00
10e2ca5d06 调试商品库存入库 2023-07-06 11:28:59 +08:00
672f3fcbae Merge branch 'feature/purchase_record' into dev 2023-07-06 10:38:43 +08:00
e7d94907f8 商品列表返回规格 2023-07-06 10:38:30 +08:00
4ee14572da Merge branch 'feature/purchase_record' into dev 2023-07-06 10:24:59 +08:00
514d308123 采购订单监控销量 2023-07-06 10:24:49 +08:00
1139f75e0c Merge branch 'feature/purchase_record' into dev 2023-07-05 17:45:35 +08:00
be67eb8df9 商品下单后增加进货记录的销量,取消和退款后减销量 2023-07-05 17:45:19 +08:00
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