2634 Commits

Author SHA1 Message Date
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
mkm
d182aae5b1 Merge pull request 'dev' (#152) from dev into master
Reviewed-on: #152
2024-02-23 11:22:29 +08:00
mkm
5bd3f298c4 商城diy文件 2024-02-23 11:21:09 +08:00
8f3ce183e8 调整红包记录查询 2024-02-23 09:42:57 +08:00
68796f2cb2 添加定时任务 2024-02-23 09:21:07 +08:00
8e4dd95120 定时任务添加日志 2024-02-23 09:18:55 +08:00
5032e5cbfa 调整平台购物卡使用范围 2024-02-22 17:48:04 +08:00
199bc98697 调整平台购物卡使用范围 2024-02-22 17:45:51 +08:00
fecac3d818 添加购物卡自动发货 2024-02-22 17:21:22 +08:00
61b141c33c 调整购物卡下单校验 2024-02-22 17:06:04 +08:00
57ad28e7be 调整购物卡下单校验 2024-02-22 17:05:30 +08:00