2492 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
mkm	fa7e054bee	更新	2024-01-23 12:27:10 +08:00
luofei	8890972390	添加云仓关键词搜索	2024-01-23 11:59:47 +08:00
mkm	6ad40b971c	Merge pull request 'dev' (#125) from dev into master ... Reviewed-on: #125	2024-01-23 11:58:13 +08:00
luofei	908968961c	调整活动商品限购	2024-01-23 11:47:07 +08:00
luofei	8386b526a6	调整活动商品限购	2024-01-23 11:43:25 +08:00
luofei	566808e9d0	调整活动商品限购	2024-01-23 11:41:00 +08:00
luofei	cc8562411c	调整云仓商品列表查询	2024-01-23 11:25:44 +08:00
luofei	852904cbd9	添加活动商品限购	2024-01-23 11:16:10 +08:00
luofei	fc906e0528	添加活动商品专区	2024-01-23 10:24:39 +08:00
mkm	09fb3d87b3	Merge pull request '更新' (#124) from dev into master ... Reviewed-on: #124	2024-01-22 19:13:53 +08:00
mkm	cb6dfe58f9	更新	2024-01-22 19:13:34 +08:00
mkm	c947db7391	Merge pull request '更新距离' (#123) from dev into master ... Reviewed-on: #123	2024-01-22 19:00:20 +08:00
mkm	25c31503e5	更新距离	2024-01-22 19:00:07 +08:00
mkm	8bf7568f8f	Merge pull request 'dev' (#122) from dev into master ... Reviewed-on: #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	1af1b7570b	调整商品列表查询	2024-01-22 16:42:18 +08:00
luofei	e39c96e65c	调整商品列表查询	2024-01-22 16:31:33 +08:00
mkm	360762f3f8	Merge pull request '修改拉新订单金额判断' (#121) from fix into master ... Reviewed-on: #121	2024-01-22 15:40:47 +08:00
luofei	0022f6076a	修改拉新订单金额判断	2024-01-22 15:30:42 +08:00
luofei	07a4dba152	调整商品列表查询	2024-01-22 15:18:30 +08:00
luofei	13403e44e7	调整商品列表查询	2024-01-22 14:22:09 +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
mkm	ab0d2e62fe	更新	2024-01-22 10:48:44 +08:00
mkm	aa07cc9a50	更新	2024-01-22 10:37:05 +08:00
luofei	fb2b83f60f	修改二维码生成的错误	2024-01-22 10:11:40 +08:00
mkm	0e08f12f58	Merge pull request 'dev' (#120) from dev into master ... Reviewed-on: #120	2024-01-22 01:20:20 +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	28ddba5f75	Merge pull request 'dev' (#119) from dev into master ... Reviewed-on: #119	2024-01-22 01:04:38 +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
mkm	dc69ce86ce	更新	2024-01-22 00:28:09 +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	94d3d1d95b	Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev	2024-01-21 22:58:30 +08:00
lewis	dc16d6ffc9	处理红包使用的错误	2024-01-21 22:58:19 +08:00
mkm	8878ac5942	Merge pull request '更新' (#118) from kkk into dev ... Reviewed-on: #118	2024-01-21 22:51:59 +08:00
mkm	d83379f0c6	更新	2024-01-21 22:51:04 +08:00
lewis	f96c499d00	调整活动参与状态查询	2024-01-21 22:39:07 +08:00
mkm	1b511a8e5a	更新	2024-01-21 21:47:08 +08:00