231 Commits

Author SHA1 Message Date
2015422c5d 调整活动订单有效金额查询 2024-01-30 17:05:41 +08:00
f53d5f8f24 调整退还红包的错误 2024-01-30 16:23:59 +08:00
19cbb37def 优化财务流水写入 2024-01-30 14:13:10 +08:00
3626181717 优化财务流水写入 2024-01-30 14:10:53 +08:00
38157d4bbb 优化财务流水写入 2024-01-30 13:56:27 +08:00
f5aaee07e1 优化财务流水写入 2024-01-30 11:39:10 +08:00
ccbffc730e 添加店铺直推佣金 2024-01-29 18:04:07 +08:00
64d6de80cf 订单退款,店铺退佣金,服务团队退佣金和红包 2024-01-29 16:46:32 +08:00
f6b212da22 订单退款,退用户红包,撤销活动订单 2024-01-29 14:55:11 +08:00
665eb57c5e 修改订单红包金额分配的错误 2024-01-29 14:03:35 +08:00
66130c66d2 镇合伙人直推奖励抵扣红包 2024-01-29 11:10:16 +08:00
d738995aef 调整佣金发放和首单判断 2024-01-29 11:03:51 +08:00
mkm
fb5d12d93c 删除支付后的活动商品判断 2024-01-28 15:57:49 +08:00
85becee5f8 Merge branch 'master' into dev
# Conflicts:
#	app/common/dao/store/StoreActivityDao.php
2024-01-27 17:47:23 +08:00
mkm
98697a31eb 修改活动商品列表 2024-01-27 16:55:55 +08:00
4b4449fbe5 修改活动商品列表 2024-01-27 14:33:55 +08:00
mkm
dddfaada87 调整活动商品列表 2024-01-27 14:23:42 +08:00
ba205d9954 处理回收站商品删除的错误 2024-01-27 09:40:06 +08:00
a09dc031b3 修改订单金额的错误 2024-01-26 18:07:49 +08:00
19c9cf3c3b 修改订单金额的错误 2024-01-26 18:01:29 +08:00
f63c223506 调整退款金额的错误 2024-01-26 17:05:00 +08:00
2941a39035 调整活动商品限购 2024-01-26 15:05:40 +08:00
4c09bdee16 调整活动商品限购 2024-01-26 13:52:15 +08:00
fe119cf1a1 修改佣金写入的错误 2024-01-26 12:03:07 +08:00
eb30849646 修改活动商品库存的错误 2024-01-26 11:37:25 +08:00
mkm
2dd1348c37 更新权限 2024-01-26 09:39:36 +08:00
mkm
e2eb6d27c5 Merge branch 'master' of https://gitea.lihaink.cn/mkm/shop-php
Conflicts:
	app/common/dao/store/StoreActivityDao.php
2024-01-26 09:39:11 +08:00
mkm
5490cb5447 更新 2024-01-25 17:18:43 +08:00
de13db05a2 修改订单佣金日志写入的错误 2024-01-25 16:35:47 +08:00
mkm
9405922d72 调整日志 2024-01-25 15:13:28 +08:00
110c4c4fb1 添加商品售罄图片 2024-01-25 11:09:00 +08:00
34ee0a2e2c 修改活动商品库存 2024-01-25 10:27:00 +08:00
mkm
0271f8ffd7 更新 2024-01-24 19:01:10 +08:00
76e9db8b4e 调整地区查询和商品限购 2024-01-24 19:01:10 +08:00
mkm
33fbae7615 更新 2024-01-24 19:01:10 +08:00
2a5fc5d26a 活动商品列表添加限时优惠价 2024-01-24 19:01:10 +08:00
9ba73d596d 调整活动商品区域查询 2024-01-24 19:01:10 +08:00
ef1fd1d908 调整活动专区商品 2024-01-24 19:01:09 +08:00
dfa4e51762 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-01-24 11:19:56 +08:00
f68533cbdc 调整地区查询和商品限购 2024-01-24 11:19:51 +08:00
mkm
8ca1f287ea 更新 2024-01-24 11:02:21 +08:00
f31d3548db Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-01-24 10:30:22 +08:00
139d69f7ab 活动商品列表添加限时优惠价 2024-01-24 10:30:08 +08:00
mkm
16058304bb 更新 2024-01-24 10:17:33 +08:00
1c138a6ff8 调整活动商品区域查询 2024-01-24 10:14:09 +08:00
3911709d32 调整活动专区商品 2024-01-23 18:26:57 +08:00
mkm
0555572ac1 Merge pull request 'dev' (#133) from dev into master
Reviewed-on: #133
2024-01-23 17:55:37 +08:00
93edb83ba3 调整云仓商品列表排序 2024-01-23 17:46:39 +08:00
mkm
581bd5fbce Merge pull request '调整订单分润' (#132) from dev into master
Reviewed-on: #132
2024-01-23 17:18:55 +08:00
3986f86685 调整订单分润 2024-01-23 16:55:26 +08:00