2644 Commits

Author SHA1 Message Date
bf09ec7935 添加生成商户线下收款码 2024-02-29 17:26:31 +08:00
eb20948bcb 添加线下扫码支付 2024-02-29 17:01:17 +08:00
6c4ce77c83 调整商户补贴进度查询 2024-02-29 15:21:06 +08:00
da72fe2d5b 调整购物卡使用限制 2024-02-29 14:03:13 +08:00
9de3c1bde1 调整购物卡使用限制 2024-02-29 14:00:45 +08:00
mkm
4e7d87c9cf 更新 2024-02-29 12:00:26 +08:00
e2b23b9012 Merge branch 'offline_pay' into dev
# Conflicts:
#	crmeb/listens/OrderDeliveryListen.php
2024-02-29 11:58:47 +08:00
65690c80dc 修改平台购物卡发放的错误 2024-02-29 11:57:19 +08:00
ffb34f0017 Revert "商户平台支持购买普通店铺商品"
This reverts commit 4290a872bea072d72806f9c687314858efaa5b73.
2024-02-29 11:51:27 +08:00
4290a872be 商户平台支持购买普通店铺商品 2024-02-29 10:41:31 +08:00
40b0ef425a 修改供应链订单列表的错误 2024-02-29 09:55:54 +08:00
0c1f7ac16a Merge branch 'offline_pay' into dev 2024-02-29 09:51:26 +08:00
e68e8f850b 修改后台转账订单的错误 2024-02-29 09:50:57 +08:00
1e414ac361 Merge branch 'offline_pay' into dev 2024-02-29 09:40:44 +08:00
f45c17911b 调整线下支付 2024-02-29 09:40:10 +08:00
a2529f0601 仅分销员能生成二维码 2024-02-29 09:38:37 +08:00
38fb60b8b1 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-02-28 18:00:16 +08:00
52d6cb27ad 调整商户采购金额写入 2024-02-28 18:00:11 +08:00
mkm
121527bdde 更新 2024-02-28 17:49:09 +08:00
mkm
4fdd1d1e7c 更新 2024-02-28 17:33:11 +08:00
mkm
baeefd5c35 更新 2024-02-28 16:51:43 +08:00
4b9c717ec6 调整商户采购金额写入 2024-02-28 16:17:17 +08:00
5abee67569 添加商户销售补贴发放 2024-02-28 15:55:48 +08:00
7f38a8183e 调整商品毛利率计算 2024-02-28 14:27:43 +08:00
717a1c2a1c Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-02-28 14:17:50 +08:00
a436f7227c 调整商品列表搜索 2024-02-28 14:17:45 +08:00
mkm
6b85dd45fd 更新wget操作 2024-02-28 12:11:53 +08:00
d787726c86 添加商品毛利率计算 2024-02-28 12:09:28 +08:00
d3f367ee3b 调整财务账单导出 2024-02-28 11:41:24 +08:00
25ad0672df 调整订单财务流水 2024-02-28 11:27:56 +08:00
74bee7bf69 调整订单财务流水 2024-02-28 11:24:06 +08:00
mkm
ca9a081bf5 更新 2024-02-28 11:04:06 +08:00
7a35ac2475 调整订单财务流水 2024-02-28 10:17:22 +08:00
57a11fd096 调整商户交易申请 2024-02-28 10:04:24 +08:00
01cbca8407 调整商户入驻申请 2024-02-28 09:55:44 +08:00
abab7ed19a 调整商户交易申请 2024-02-28 09:43:19 +08:00
e37ae89814 调整商户交易申请 2024-02-28 09:34:22 +08:00
f4b3b82fb7 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-02-27 18:05:22 +08:00
cde71f49a7 调整订单佣金 2024-02-27 18:05:17 +08:00
mkm
b9ff0142e6 Merge pull request 'dev' (#154) from dev into master
Reviewed-on: #154
2024-02-27 17:26:03 +08:00
mkm
32ffa10737 更新h5 2024-02-27 17:24:41 +08:00
30027973a6 调整商户交易开通申请 2024-02-27 16:29:05 +08:00
92cebd2e5a 调整商户交易申请 2024-02-27 15:16:12 +08:00
mkm
066bd53500 更新pc 2024-02-27 11:38:21 +08:00
50b7b92d1e 调整商户入驻申请 2024-02-26 15:13:22 +08:00
mkm
3f02fa00b3 Merge pull request 'dev' (#153) from dev into master
Reviewed-on: #153
2024-02-26 11:10:32 +08:00
1347db1771 上传文件支持webp 2024-02-24 15:58:51 +08:00
bb28766036 调整商户申请查询 2024-02-24 11:06:18 +08:00
b8014f70dd 调整抵扣红包使用限制 2024-02-23 16:41:49 +08:00
2bcee04f20 预售商品列表添加关键字搜索 2024-02-23 14:28:44 +08:00