367 Commits

Author	SHA1	Message	Date
lzh	92c8e4d574	优化套餐余额更新方式，直接使用旧数据模型并改用Save方法	2025-06-25 10:13:57 +08:00
lzh	93dac4ec2e	Merge branch 'dev-lzh' into dev	2025-06-25 09:33:37 +08:00
lzh	1b5b6037fd	增加待确认作品状态过滤条件	2025-06-25 09:33:29 +08:00
lzh	5a3367e47d	Merge branch 'dev-lzh' into dev	2025-06-24 17:08:47 +08:00
lzh	1885d2b8dc	"优化用户余额查询的JOIN方式并添加分组"	2025-06-24 17:08:36 +08:00
lzh	7154d0a92a	Merge branch 'dev-lzh' into dev	2025-06-24 16:29:20 +08:00
lzh	f55af5f719	过滤待确认条件	2025-06-24 16:29:11 +08:00
sxy	cd4e1492c8	Merge branch 'sxy' into dev	2025-06-24 16:01:05 +08:00
sxy	668b7eb06e	修改信息-服务类型	2025-06-24 16:00:45 +08:00
sxy	6e29d40998	Merge branch 'sxy' into dev	2025-06-24 15:54:25 +08:00
sxy	56c17a709f	修改信息	2025-06-24 15:53:10 +08:00
lzh	d6888a4e3c	Merge branch 'dev-lzh' into dev	2025-06-24 15:14:18 +08:00
lzh	043274e61f	添加余量信息已购买字段	2025-06-24 15:08:37 +08:00
lzh	38fccfa827	Merge branch 'dev-lzh' into dev	2025-06-24 15:04:16 +08:00
lzh	0167e40f9e	过滤重复的作品id	2025-06-24 15:04:09 +08:00
sxy	e46e5a3635	Merge branch 'sxy' into dev	2025-06-24 14:25:06 +08:00
sxy	3c1984be81	增加语言表获取接口	2025-06-24 14:22:31 +08:00
lzh	e8f76dd102	Merge branch 'dev-lzh' into dev	2025-06-24 14:03:55 +08:00
lzh	46a6c5723f	过滤被删除的用户	2025-06-24 14:03:35 +08:00
桀尼龟	58a066315b	解决冲突	2025-06-24 13:42:22 +08:00
桀尼龟	f02601e5e8	修改	2025-06-24 13:41:10 +08:00
lzh	93ccab7d42	Merge branch 'dev-lzh' into dev	2025-06-24 13:38:22 +08:00
lzh	bfa9fc4026	订单记录取最新	2025-06-24 13:38:16 +08:00
lzh	621f6c906d	Merge branch 'dev-lzh' into dev	2025-06-24 12:00:17 +08:00
lzh	fb3b33a817	显示过期的套餐信息	2025-06-24 12:00:09 +08:00
lzh	360ea2b4d5	Merge branch 'dev-lzh' into dev	2025-06-24 11:27:58 +08:00
lzh	70c4eacce4	1	2025-06-24 11:27:50 +08:00
sxy	a45369d1b5	Merge branch 'sxy' into dev	2025-06-23 16:25:17 +08:00
sxy	52d9baf2e6	修改上下架校验	2025-06-23 16:25:03 +08:00
sxy	cba59941cb	Merge branch 'sxy' into dev	2025-06-23 15:24:05 +08:00
sxy	ed0f0c9584	修改套餐逻辑	2025-06-23 15:23:49 +08:00
lzh	06da79539e	Merge branch 'dev-lzh' into dev	2025-06-23 14:26:43 +08:00
lzh	f82a96907c	1	2025-06-23 14:24:12 +08:00
lzh	3506b1fdc7	Merge branch 'dev-lzh' into dev	2025-06-23 14:11:32 +08:00
lzh	24c701d9a1	修改使用记录的用户名搜索	2025-06-23 14:11:07 +08:00
lzh	99ba1fc52d	Merge branch 'dev-lzh' into dev	2025-06-23 13:55:34 +08:00
lzh	37bae4398d	修改使用记录排序	2025-06-23 13:55:29 +08:00
lzh	107a457111	Merge branch 'dev-lzh' into dev	2025-06-23 10:37:11 +08:00
lzh	d3b82f4352	余量列表支持电话号码搜索	2025-06-23 10:37:04 +08:00
lzh	edc93077a7	Merge branch 'dev-lzh' into dev	2025-06-20 16:57:07 +08:00
lzh	75a75e9480	时区错误修改	2025-06-20 16:57:01 +08:00
lzh	1228060121	Merge branch 'dev-lzh' into dev	2025-06-20 16:36:17 +08:00
lzh	8528412c33	补充余量信息user_id	2025-06-20 16:36:11 +08:00
sxy	f9510db2eb	Merge branch 'sxy' into dev	2025-06-20 16:26:40 +08:00
sxy	d0dfb7ff96	修改增值服务价格模式下的节省金额	2025-06-20 16:26:17 +08:00
lzh	fabc41aa92	Merge branch 'dev-lzh' into dev	2025-06-20 16:18:45 +08:00
lzh	4e2faf05cb	添加未购买过滤	2025-06-20 16:18:20 +08:00
lzh	c6a65f4589	1	2025-06-20 15:54:06 +08:00
桀尼龟	19aa5b8955	解决冲突	2025-06-20 15:47:25 +08:00
桀尼龟	5753c952f4	修改	2025-06-20 15:45:58 +08:00
sxy	c61ab9c0bd	Merge branch 'sxy' into dev	2025-06-20 15:35:06 +08:00
sxy	a6d315a283	修改增值服务保存逻辑-1	2025-06-20 15:34:55 +08:00
lzh	b896c73fbb	Merge branch 'dev-lzh' into dev	2025-06-20 15:29:10 +08:00
lzh	9e36dfde6b	扩展记录时间服务	2025-06-20 15:28:50 +08:00
sxy	9d57cb0188	Merge branch 'sxy' into dev	2025-06-20 15:27:01 +08:00
lzh	9f5798c2be	扩展记录时间服务	2025-06-20 15:26:50 +08:00
sxy	952caaaf91	修改增值服务保存逻辑	2025-06-20 15:26:35 +08:00
lzh	c545988663	Merge branch 'dev-lzh' into dev	2025-06-20 15:24:29 +08:00
lzh	e26829e19b	扩展记录用户名搜索	2025-06-20 15:24:24 +08:00
lzh	145a4258eb	Merge branch 'dev-lzh' into dev	2025-06-20 15:10:46 +08:00
lzh	089d8af480	支持套餐名搜索	2025-06-20 15:10:39 +08:00
sxy	32632183cf	Merge branch 'sxy' into dev	2025-06-20 14:58:46 +08:00
sxy	bff2938313	修改返回信息	2025-06-20 14:58:32 +08:00
lzh	5c0652888e	Merge branch 'dev-lzh' into dev	2025-06-20 14:58:00 +08:00
lzh	0fae4587d8	使用真实姓名搜索	2025-06-20 14:57:54 +08:00
lzh	f9fe550528	Merge branch 'dev-lzh' into dev	2025-06-20 14:42:27 +08:00
lzh	2d9d620062	支持json搜索	2025-06-20 14:42:21 +08:00
sxy	44f40ee10f	Merge branch 'sxy' into dev	2025-06-20 14:34:09 +08:00
sxy	97c4bda203	修改价格模式-1	2025-06-20 14:33:57 +08:00
sxy	14415f07f5	修改价格模式	2025-06-20 14:31:55 +08:00
sxy	54ea18edc4	Merge branch 'sxy' into dev	2025-06-20 14:18:49 +08:00
sxy	3bc6a5caa0	修改imgoption	2025-06-20 14:16:45 +08:00
lzh	83ea888de1	Merge branch 'dev-lzh' into dev	2025-06-20 14:14:50 +08:00
lzh	f933e4887f	添加扩展时间字段	2025-06-20 14:14:44 +08:00
lzh	e39b72f666	Merge branch 'dev-lzh' into dev	2025-06-20 14:07:02 +08:00
lzh	94e5c77f90	过期时间精确到秒	2025-06-20 14:06:24 +08:00
桀尼龟	190faad47f	Merge branch 'jng' into dev	2025-06-20 13:24:13 +08:00
桀尼龟	53a407cc1c	修改	2025-06-20 13:23:47 +08:00
sxy	8febf219f7	Merge branch 'sxy' into dev	2025-06-20 13:05:59 +08:00
sxy	d95dccf7c0	修改bug	2025-06-20 13:05:32 +08:00
sxy	b9c0b6b282	Merge branch 'sxy' into dev	2025-06-20 11:42:56 +08:00
sxy	bcdb764522	修改bug	2025-06-20 11:42:41 +08:00
lzh	137255a2e1	Merge branch 'dev-lzh' into dev	2025-06-20 10:41:27 +08:00
lzh	99c4b85a62	订单号字段错误修改	2025-06-20 10:41:20 +08:00
lzh	f4036ffa77	Merge branch 'dev-lzh' into dev	2025-06-20 10:37:54 +08:00
lzh	16f5e1f7ec	订单号字段错误修改	2025-06-20 10:37:38 +08:00
lzh	e59d05f1e5	Merge branch 'dev-lzh' into dev	2025-06-20 10:33:38 +08:00
lzh	0429854814	订单号字段错误修改	2025-06-20 10:33:32 +08:00
lzh	ece5feb935	Merge branch 'dev-lzh' into dev	2025-06-20 10:27:23 +08:00
lzh	9b6549f141	添加关联订单号字段	2025-06-20 10:27:00 +08:00
lzh	d85bfa4fa0	修改余量查询错误	2025-06-20 10:05:55 +08:00
lzh	b415537dd7	修改余量查询错误	2025-06-20 10:05:31 +08:00
lzh	8f6326bfaf	Merge branch 'dev-lzh' into dev	2025-06-20 09:42:49 +08:00
lzh	f612f8ad23	补充缺失字段	2025-06-20 09:42:14 +08:00
lzh	3da31de230	Merge branch 'dev-lzh' into dev	2025-06-19 16:59:34 +08:00
lzh	fbea508cfe	使用真实姓名	2025-06-19 16:59:27 +08:00
sxy	0304b71d8f	Merge branch 'sxy' into dev	2025-06-19 16:44:57 +08:00
sxy	33073667e8	修改上下架	2025-06-19 16:44:38 +08:00
lzh	41cd63b88a	Merge branch 'dev-lzh' into dev	2025-06-19 16:36:36 +08:00
lzh	02d0de5dad	使用真实姓名	2025-06-19 16:36:28 +08:00