2644 Commits

Author SHA1 Message Date
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
089a868ebd 大礼包添加限购 2024-02-22 16:47:38 +08:00
fdbe4e0626 添加定时激活商户补贴 2024-02-22 16:40:11 +08:00
31d5a68c21 添加购物卡购买次数限制 2024-02-22 16:09:55 +08:00
2f34a03800 调试购物卡发货 2024-02-22 15:53:37 +08:00
0df0acc5d8 调整下单跨区限制 2024-02-22 15:31:39 +08:00
c9a97a22fd 调整购物卡下单校验 2024-02-22 15:28:11 +08:00
mkm
076901f3e2 Merge pull request '更新' (#151) from dev into master
Reviewed-on: #151
2024-02-22 11:13:18 +08:00
mkm
67376def68 更新 2024-02-22 11:12:59 +08:00
mkm
ad04271c25 Merge pull request '更新文字' (#150) from dev into master
Reviewed-on: #150
2024-02-21 18:10:18 +08:00
mkm
fbc6f697db 更新文字 2024-02-21 18:09:24 +08:00
mkm
cdeea8c980 Merge pull request 'dev' (#149) from dev into master
Reviewed-on: #149
2024-02-21 10:29:12 +08:00
49461d5efd 修改名优特产查询 2024-02-21 10:28:00 +08:00
76ae26ff00 订单列表返回预售商品 2024-02-21 09:24:20 +08:00
mkm
ea840ca719 Merge pull request 'dev' (#148) from dev into master
Reviewed-on: #148
2024-02-21 09:13:00 +08:00
179b479e31 订单列表返回预售商品 2024-02-20 18:07:40 +08:00
f19be1888d 订单列表返回预售商品 2024-02-20 18:05:04 +08:00
3f5902fa3e 订单列表返回预售商品 2024-02-20 17:47:21 +08:00
050208900a 预售商品支持跨区域购买 2024-02-20 17:33:29 +08:00
6d6eccb016 添加用户邀请商户记录 2024-02-20 16:56:20 +08:00
db1c05543e Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-02-20 15:04:13 +08:00
764284256e 处理预售商品的错误 2024-02-20 15:04:07 +08:00
mkm
0f05be9e42 更新商城h5 2024-02-20 11:55:54 +08:00
mkm
29e23ec265 更新商城h5 2024-02-20 11:55:35 +08:00
mkm
5de370dd26 更新 2024-02-20 11:33:33 +08:00
mkm
090289b10a 更新h5 2024-02-20 11:19:45 +08:00
mkm
d8f0180bf9 更新 2024-02-20 11:19:14 +08:00
mkm
8995f56859 更新 2024-02-20 11:16:36 +08:00
mkm
94fa89c575 Merge pull request 'dev' (#147) from dev into master
Reviewed-on: #147
2024-02-20 11:06:48 +08:00
mkm
c31763cf52 更新 2024-02-20 11:02:01 +08:00
2c22405ebe 调整供销佣金退款 2024-02-07 16:19:16 +08:00
11720f7a35 添加注释 2024-02-07 14:57:13 +08:00
fa89daa631 处理代发订单跨店铺的错误 2024-02-06 17:52:05 +08:00
d89f0983e7 处理代发订单跨店铺的错误 2024-02-06 17:47:04 +08:00
90bbc61ed7 测试充值送抵扣红包 2024-02-06 16:09:46 +08:00
581037f812 测试充值送抵扣红包 2024-02-06 15:26:22 +08:00
107b4ed16c 修改用户首单判断 2024-02-06 15:00:24 +08:00
98d65a1cad 修改红包退还金额的错误 2024-02-05 17:59:10 +08:00
a64abab901 供应链保证金退款 2024-02-05 17:17:15 +08:00
mkm
959a01a1d1 更新pc 2024-02-05 10:40:34 +08:00
ea531d68aa 充值赠送现金抵扣红包 2024-02-05 10:38:18 +08:00