761 Commits

Author	SHA1	Message	Date
mkm	8bf7568f8f	Merge pull request 'dev' (#122) from dev into master ... Reviewed-on: https://gitea.lihaink.cn/mkm/shop-php/pulls/122	2024-01-22 18:24:01 +08:00
luofei	2bab5ff692	没有关联供应链的商品自动下架	2024-01-22 18:03:01 +08:00
luofei	ebac1ec22b	调整下单前置校验	2024-01-22 17:41:36 +08:00
luofei	0c0432f01f	调整下单前置校验	2024-01-22 17:27:50 +08:00
luofei	0022f6076a	修改拉新订单金额判断	2024-01-22 15:30:42 +08:00
luofei	07a4dba152	调整商品列表查询	2024-01-22 15:18:30 +08:00
luofei	d4094ba1c3	调整商品列表查询	2024-01-22 14:11:53 +08:00
luofei	b2f006f51c	Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev	2024-01-22 13:56:43 +08:00
luofei	aa368d2520	调整商品列表查询	2024-01-22 13:56:38 +08:00
lewis	a4c7f89519	Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev ... # Conflicts: # app/common/repositories/store/order/StoreOrderCreateRepository.php	2024-01-22 01:10:35 +08:00
lewis	fc7fe819fc	处理红包使用的错误	2024-01-22 01:06:44 +08:00
mkm	6d4661b3a5	更新 app/common/repositories/store/order/StoreOrderCreateRepository.php ... 更新	2024-01-22 00:52:35 +08:00
lewis	de11c70461	处理红包使用的错误	2024-01-22 00:50:22 +08:00
lewis	4e264aef3c	Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev	2024-01-22 00:35:40 +08:00
lewis	742310d811	处理红包使用后未扣除的问题	2024-01-22 00:35:29 +08:00
mkm	383e36583f	更新	2024-01-22 00:32:35 +08:00
mkm	80f744c1b3	更新限制	2024-01-22 00:29:53 +08:00
lewis	641f53ec6e	处理红包使用后未扣除的问题	2024-01-22 00:17:21 +08:00
lewis	1318f48558	处理红包使用的错误	2024-01-22 00:01:07 +08:00
lewis	3e28caaecc	调整活动完成状态查询	2024-01-21 23:50:07 +08:00
lewis	098557151d	调整活动完成状态查询	2024-01-21 23:44:27 +08:00
lewis	dc16d6ffc9	处理红包使用的错误	2024-01-21 22:58:19 +08:00
lewis	f96c499d00	调整活动参与状态查询	2024-01-21 22:39:07 +08:00
lewis	4df2a3755c	调整自提策略	2024-01-21 21:30:17 +08:00
lewis	559376a22b	Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev	2024-01-21 21:16:37 +08:00
lewis	6026efc4df	调整用户红包记录	2024-01-21 21:16:33 +08:00
mkm	9b07143f00	更新	2024-01-21 21:09:22 +08:00
mkm	1b2aed7a4f	更新	2024-01-21 20:51:02 +08:00
mkm	d004a8ad16	更新	2024-01-21 20:40:21 +08:00
mkm	c04d4d19d6	更新	2024-01-21 20:28:41 +08:00
mkm	d92ce3d5ea	更新	2024-01-21 19:52:49 +08:00
luofei	20b60461bf	调整下单校验	2024-01-21 18:04:52 +08:00
luofei	01e681d7ee	调整下单校验	2024-01-21 17:44:53 +08:00
luofei	c2d403039c	调整下单校验	2024-01-21 17:36:16 +08:00
luofei	d605bf2627	Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev	2024-01-21 17:24:04 +08:00
luofei	096d946574	调整下单校验	2024-01-21 17:23:59 +08:00
mkm	05133d752b	更新	2024-01-21 17:08:17 +08:00
mkm	f0e04cf52c	更新	2024-01-21 17:08:17 +08:00
luofei	2feea0369b	调整配送员分润时机	2024-01-21 17:05:05 +08:00
luofei	be4fe10f0c	Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev	2024-01-21 17:02:06 +08:00
luofei	7ed5bf37ed	调整订单分润	2024-01-21 17:02:02 +08:00
mkm	58c27d36cd	更新	2024-01-21 15:41:43 +08:00
mkm	d5a52df439	更新	2024-01-21 15:06:29 +08:00
luofei	ab8e458f00	Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev	2024-01-21 15:05:03 +08:00
luofei	deb2f187ab	调整服务团队佣金结算	2024-01-21 15:04:59 +08:00
mkm	b7d55aa98d	新增字段	2024-01-21 15:01:57 +08:00
mkm	4bd91ebb98	更新	2024-01-21 15:00:24 +08:00
luofei	e066be0bbc	Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev	2024-01-21 14:41:38 +08:00
luofei	6515cff841	调整红包发放	2024-01-21 14:41:31 +08:00
mkm	0246268c70	删除信息	2024-01-21 14:36:13 +08:00