2180 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
mkm	2b012abae7	更新	2024-01-21 13:47:28 +08:00
mkm	f6b72481c0	更新红包计算金额	2024-01-21 11:53:01 +08:00
luofei	0b128503b1	调整下单的错误	2024-01-21 11:17:59 +08:00
luofei	eb0b137284	调整活动时间判断	2024-01-21 11:04:19 +08:00
luofei	d10333c024	Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev	2024-01-21 10:56:32 +08:00
luofei	a642abe2da	调整活动红包发放策略	2024-01-21 10:56:27 +08:00
mkm	7895d82ce4	更新	2024-01-21 10:13:25 +08:00
mkm	344e2c67ba	更新	2024-01-21 10:11:03 +08:00
mkm	7126d108e6	修复错误	2024-01-21 09:52:20 +08:00
mkm	f095eef1f5	更新	2024-01-21 09:47:24 +08:00
mkm	5c528703c8	更新商户端	2024-01-20 18:22:36 +08:00
luofei	e90af16576	Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev	2024-01-20 18:12:11 +08:00
luofei	7306f63ec1	修改活动结束时间判断，修改首单判断	2024-01-20 18:12:06 +08:00
mkm	ee142d3d45	更新	2024-01-20 18:07:54 +08:00
mkm	91e79605b1	更新	2024-01-20 18:01:36 +08:00
mkm	7671aa9063	更新	2024-01-20 17:46:23 +08:00
mkm	babaae3e43	更新	2024-01-20 17:22:02 +08:00
luofei	6286f5607e	Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev	2024-01-20 17:10:58 +08:00
luofei	20ffe5fc3b	调整订单佣金分润	2024-01-20 17:10:53 +08:00
mkm	22a326303c	更新	2024-01-20 16:03:26 +08:00
mkm	49e8327ac8	更新	2024-01-20 15:37:11 +08:00
mkm	3a7e8e71b7	更新	2024-01-20 15:34:57 +08:00
mkm	f1a67ff8d7	更新支付流程	2024-01-20 15:16:38 +08:00
luofei	a991fc0789	Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev	2024-01-20 15:02:27 +08:00
luofei	0724fc393a	调整订单佣金分润	2024-01-20 15:02:22 +08:00
mkm	f6c229cf59	更新	2024-01-20 14:10:15 +08:00
mkm	79911effa3	修正分润逻辑	2024-01-20 11:26:47 +08:00
mkm	d229c59859	修复流水	2024-01-20 10:53:10 +08:00
mkm	7206b01aae	修复	2024-01-20 10:51:21 +08:00
mkm	7b54109189	更新	2024-01-20 10:50:11 +08:00
luofei	2aba6a6d81	调试红包活动	2024-01-20 10:43:36 +08:00
luofei	55966ff40d	调试红包活动	2024-01-20 10:33:41 +08:00
luofei	9553526dda	Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev	2024-01-19 17:56:16 +08:00
luofei	f675551008	添加活动首单商户佣金	2024-01-19 17:56:11 +08:00
mkm	318c02be7c	更新订单流程	2024-01-19 17:20:50 +08:00
luofei	1016037ac3	调试红包活动	2024-01-19 16:07:13 +08:00
luofei	a481acd160	调试红包活动	2024-01-19 16:03:20 +08:00
luofei	8731844d54	调试红包活动	2024-01-19 15:19:37 +08:00
luofei	5aee04b943	调试红包活动	2024-01-19 15:12:10 +08:00
luofei	afe7e89d02	Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev	2024-01-19 14:43:39 +08:00
luofei	f5a0094e1d	调整消费金发放校验	2024-01-19 14:43:35 +08:00
mkm	5f85541795	更新代发订单	2024-01-19 13:33:48 +08:00
luofei	55384b2c45	添加红包获取记录	2024-01-19 11:41:01 +08:00
luofei	92da0baa39	调整活动红包领取和查询	2024-01-19 11:08:52 +08:00
luofei	8d9c4d847a	Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev	2024-01-19 10:59:38 +08:00
luofei	95cfd0d722	修改红包活动路由	2024-01-19 10:59:33 +08:00
luofei	164ab1e89c	添加用户参与红包活动状态，添加领取红包	2024-01-19 10:58:56 +08:00
mkm	593c763e16	更新下单流程	2024-01-18 18:45:58 +08:00
luofei	d268290840	Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev	2024-01-18 18:01:35 +08:00
luofei	870cfd4a8e	调整拉新活动报名	2024-01-18 18:01:30 +08:00