|
|
76e2b893a1
|
解决冲突
|
2025-07-02 15:30:51 +08:00 |
|
|
|
641c10aec2
|
解决冲突
|
2025-07-02 14:01:44 +08:00 |
|
|
|
0f40072e22
|
添加支付时间筛选
|
2025-07-02 14:00:54 +08:00 |
|
|
|
57a3154634
|
fix: 拦截重复回调
|
2025-06-27 20:03:21 +08:00 |
|
|
|
40b3d8ddde
|
Merge branch 'dev-lzh' into dev
|
2025-06-27 17:57:24 +08:00 |
|
|
|
a556777369
|
优化待确认作品查询逻辑，拆分状态条件子查询
|
2025-06-27 17:42:10 +08:00 |
|
|
|
37c525d5c2
|
"优化用户余额查询SQL，增加过期时间倒序排序；修正发布平台ID字段命名大小写不一致问题"
|
2025-06-27 16:10:39 +08:00 |
|
|
|
4ec5bb8915
|
"修正字段命名大小写不一致问题"
|
2025-06-27 15:29:53 +08:00 |
|
|
|
335a61d6e7
|
"添加过期时间降序排序并优化查询字段"
|
2025-06-27 14:44:42 +08:00 |
|
|
|
b06d06c8e2
|
添加用户ID分组查询条件
|
2025-06-27 14:37:28 +08:00 |
|
|
|
1f1fbed3a8
|
"修改数据库表名从 fiee_bundle 到 micro_bundle"
|
2025-06-27 11:32:17 +08:00 |
|
|
|
8fe858aa03
|
Merge branch 'main' of https://gitea-inner.fontree.cn/fiee/micro-bundle
|
2025-06-26 17:33:08 +08:00 |
|
|
|
f3e29cb7e8
|
解决冲突
|
2025-06-26 17:32:53 +08:00 |
|
|
|
ae4bbe29c0
|
Merge branch 'sxy'
|
2025-06-26 17:31:25 +08:00 |
|
|
|
bfc409ed70
|
Merge branch 'dev-lzh'
|
2025-06-26 17:18:58 +08:00 |
|
|
|
ea4d3cacd4
|
Merge branch 'sxy' into dev
|
2025-06-26 17:10:45 +08:00 |
|
|
|
a01be125e6
|
修改冲突
|
2025-06-26 17:10:29 +08:00 |
|
|
|
46ffdc0d0d
|
Merge branch 'jng' into dev
|
2025-06-26 13:53:41 +08:00 |
|
|
|
7c0027f624
|
修改
|
2025-06-26 13:53:16 +08:00 |
|
|
|
c25157b661
|
Merge branch 'jng' into dev
|
2025-06-26 13:41:07 +08:00 |
|
|
|
397dd56761
|
修改
|
2025-06-26 13:40:03 +08:00 |
|
|
|
0a4218757e
|
`
|
2025-06-26 09:19:23 +08:00 |
|
|
|
150e7162fe
|
优化待确认作品查询SQL，调整状态过滤条件位置
|
2025-06-26 09:18:51 +08:00 |
|
|
|
24a6fd1eba
|
Merge branch 'jng' into dev
|
2025-06-25 16:58:31 +08:00 |
|
|
|
26eb0df464
|
修改
|
2025-06-25 16:57:57 +08:00 |
|
|
|
66f70eb643
|
修改
|
2025-06-25 15:31:42 +08:00 |
|
|
|
b9313b9ba2
|
添加状态筛选
|
2025-06-25 15:29:37 +08:00 |
|
|
|
f2785fd407
|
Merge branch 'dev-lzh' into dev
|
2025-06-25 15:23:18 +08:00 |
|
|
|
4f9b72928b
|
"修正发布平台ID字段命名大小写不一致问题"
|
2025-06-25 15:21:53 +08:00 |
|
|
|
953641b575
|
Merge branch 'dev-lzh' into dev
|
2025-06-25 13:49:03 +08:00 |
|
|
|
7468c2f442
|
"修正用户余额查询SQL中的字段别名拼写错误"
|
2025-06-25 13:48:54 +08:00 |
|
|
|
047451e5c4
|
Merge branch 'sxy' into dev
|
2025-06-25 13:37:43 +08:00 |
|
|
|
9c9e9c0663
|
修改返回数据校验
|
2025-06-25 13:36:33 +08:00 |
|
|
|
f4841ed772
|
Merge branch 'dev-lzh' into dev
|
2025-06-25 11:56:20 +08:00 |
|
|
|
e4a9c3ac4d
|
优化套餐余额查询SQL，调整JOIN逻辑并简化查询条件
|
2025-06-25 11:56:09 +08:00 |
|
|
|
63516ad0a8
|
Merge branch 'dev-lzh' into dev
|
2025-06-25 10:14:06 +08:00 |
|
|
|
92c8e4d574
|
优化套餐余额更新方式，直接使用旧数据模型并改用Save方法
|
2025-06-25 10:13:57 +08:00 |
|
|
|
93dac4ec2e
|
Merge branch 'dev-lzh' into dev
|
2025-06-25 09:33:37 +08:00 |
|
|
|
1b5b6037fd
|
增加待确认作品状态过滤条件
|
2025-06-25 09:33:29 +08:00 |
|
|
|
5a3367e47d
|
Merge branch 'dev-lzh' into dev
|
2025-06-24 17:08:47 +08:00 |
|
|
|
1885d2b8dc
|
"优化用户余额查询的JOIN方式并添加分组"
|
2025-06-24 17:08:36 +08:00 |
|
|
|
7154d0a92a
|
Merge branch 'dev-lzh' into dev
|
2025-06-24 16:29:20 +08:00 |
|
|
|
f55af5f719
|
过滤待确认条件
|
2025-06-24 16:29:11 +08:00 |
|
|
|
cd4e1492c8
|
Merge branch 'sxy' into dev
|
2025-06-24 16:01:05 +08:00 |
|
|
|
668b7eb06e
|
修改信息-服务类型
|
2025-06-24 16:00:45 +08:00 |
|
|
|
6e29d40998
|
Merge branch 'sxy' into dev
|
2025-06-24 15:54:25 +08:00 |
|
|
|
56c17a709f
|
修改信息
|
2025-06-24 15:53:10 +08:00 |
|
|
|
d6888a4e3c
|
Merge branch 'dev-lzh' into dev
|
2025-06-24 15:14:18 +08:00 |
|
|
|
043274e61f
|
添加余量信息已购买字段
|
2025-06-24 15:08:37 +08:00 |
|
|
|
38fccfa827
|
Merge branch 'dev-lzh' into dev
|
2025-06-24 15:04:16 +08:00 |
|
|
|
0167e40f9e
|
过滤重复的作品id
|
2025-06-24 15:04:09 +08:00 |
|
|
|
e46e5a3635
|
Merge branch 'sxy' into dev
|
2025-06-24 14:25:06 +08:00 |
|
|
|
3c1984be81
|
增加语言表获取接口
|
2025-06-24 14:22:31 +08:00 |
|
|
|
e8f76dd102
|
Merge branch 'dev-lzh' into dev
|
2025-06-24 14:03:55 +08:00 |
|
|
|
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 |
|
|
|
93ccab7d42
|
Merge branch 'dev-lzh' into dev
|
2025-06-24 13:38:22 +08:00 |
|
|
|
bfa9fc4026
|
订单记录取最新
|
2025-06-24 13:38:16 +08:00 |
|
|
|
621f6c906d
|
Merge branch 'dev-lzh' into dev
|
2025-06-24 12:00:17 +08:00 |
|
|
|
fb3b33a817
|
显示过期的套餐信息
|
2025-06-24 12:00:09 +08:00 |
|
|
|
360ea2b4d5
|
Merge branch 'dev-lzh' into dev
|
2025-06-24 11:27:58 +08:00 |
|
|
|
70c4eacce4
|
1
|
2025-06-24 11:27:50 +08:00 |
|
|
|
a45369d1b5
|
Merge branch 'sxy' into dev
|
2025-06-23 16:25:17 +08:00 |
|
|
|
52d9baf2e6
|
修改上下架校验
|
2025-06-23 16:25:03 +08:00 |
|
|
|
cba59941cb
|
Merge branch 'sxy' into dev
|
2025-06-23 15:24:05 +08:00 |
|
|
|
ed0f0c9584
|
修改套餐逻辑
|
2025-06-23 15:23:49 +08:00 |
|
|
|
06da79539e
|
Merge branch 'dev-lzh' into dev
|
2025-06-23 14:26:43 +08:00 |
|
|
|
f82a96907c
|
1
|
2025-06-23 14:24:12 +08:00 |
|
|
|
3506b1fdc7
|
Merge branch 'dev-lzh' into dev
|
2025-06-23 14:11:32 +08:00 |
|
|
|
24c701d9a1
|
修改使用记录的用户名搜索
|
2025-06-23 14:11:07 +08:00 |
|
|
|
99ba1fc52d
|
Merge branch 'dev-lzh' into dev
|
2025-06-23 13:55:34 +08:00 |
|
|
|
37bae4398d
|
修改使用记录排序
|
2025-06-23 13:55:29 +08:00 |
|
|
|
107a457111
|
Merge branch 'dev-lzh' into dev
|
2025-06-23 10:37:11 +08:00 |
|
|
|
d3b82f4352
|
余量列表支持电话号码搜索
|
2025-06-23 10:37:04 +08:00 |
|
|
|
edc93077a7
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 16:57:07 +08:00 |
|
|
|
75a75e9480
|
时区错误修改
|
2025-06-20 16:57:01 +08:00 |
|
|
|
1228060121
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 16:36:17 +08:00 |
|
|
|
8528412c33
|
补充余量信息user_id
|
2025-06-20 16:36:11 +08:00 |
|
|
|
f9510db2eb
|
Merge branch 'sxy' into dev
|
2025-06-20 16:26:40 +08:00 |
|
|
|
d0dfb7ff96
|
修改增值服务价格模式下的节省金额
|
2025-06-20 16:26:17 +08:00 |
|
|
|
fabc41aa92
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 16:18:45 +08:00 |
|
|
|
4e2faf05cb
|
添加未购买过滤
|
2025-06-20 16:18:20 +08:00 |
|
|
|
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 |
|
|
|
c61ab9c0bd
|
Merge branch 'sxy' into dev
|
2025-06-20 15:35:06 +08:00 |
|
|
|
a6d315a283
|
修改增值服务保存逻辑-1
|
2025-06-20 15:34:55 +08:00 |
|
|
|
b896c73fbb
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 15:29:10 +08:00 |
|
|
|
9e36dfde6b
|
扩展记录时间服务
|
2025-06-20 15:28:50 +08:00 |
|
|
|
9d57cb0188
|
Merge branch 'sxy' into dev
|
2025-06-20 15:27:01 +08:00 |
|
|
|
9f5798c2be
|
扩展记录时间服务
|
2025-06-20 15:26:50 +08:00 |
|
|
|
952caaaf91
|
修改增值服务保存逻辑
|
2025-06-20 15:26:35 +08:00 |
|
|
|
c545988663
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 15:24:29 +08:00 |
|
|
|
e26829e19b
|
扩展记录用户名搜索
|
2025-06-20 15:24:24 +08:00 |
|
|
|
145a4258eb
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 15:10:46 +08:00 |
|
|
|
089d8af480
|
支持套餐名搜索
|
2025-06-20 15:10:39 +08:00 |
|
|
|
32632183cf
|
Merge branch 'sxy' into dev
|
2025-06-20 14:58:46 +08:00 |
|
|
|
bff2938313
|
修改返回信息
|
2025-06-20 14:58:32 +08:00 |
|
|
|
5c0652888e
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 14:58:00 +08:00 |
|
|
|
0fae4587d8
|
使用真实姓名搜索
|
2025-06-20 14:57:54 +08:00 |
|
|
|
f9fe550528
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 14:42:27 +08:00 |
|
|
|
2d9d620062
|
支持json搜索
|
2025-06-20 14:42:21 +08:00 |
|
|
|
44f40ee10f
|
Merge branch 'sxy' into dev
|
2025-06-20 14:34:09 +08:00 |
|
|
|
97c4bda203
|
修改价格模式-1
|
2025-06-20 14:33:57 +08:00 |
|
|
|
14415f07f5
|
修改价格模式
|
2025-06-20 14:31:55 +08:00 |
|
|
|
54ea18edc4
|
Merge branch 'sxy' into dev
|
2025-06-20 14:18:49 +08:00 |
|
|
|
3bc6a5caa0
|
修改imgoption
|
2025-06-20 14:16:45 +08:00 |
|
|
|
83ea888de1
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 14:14:50 +08:00 |
|
|
|
f933e4887f
|
添加扩展时间字段
|
2025-06-20 14:14:44 +08:00 |
|
|
|
e39b72f666
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 14:07:02 +08:00 |
|
|
|
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 |
|
|
|
8febf219f7
|
Merge branch 'sxy' into dev
|
2025-06-20 13:05:59 +08:00 |
|
|
|
d95dccf7c0
|
修改bug
|
2025-06-20 13:05:32 +08:00 |
|
|
|
b9c0b6b282
|
Merge branch 'sxy' into dev
|
2025-06-20 11:42:56 +08:00 |
|
|
|
bcdb764522
|
修改bug
|
2025-06-20 11:42:41 +08:00 |
|
|
|
137255a2e1
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 10:41:27 +08:00 |
|
|
|
99c4b85a62
|
订单号字段错误修改
|
2025-06-20 10:41:20 +08:00 |
|
|
|
f4036ffa77
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 10:37:54 +08:00 |
|
|
|
16f5e1f7ec
|
订单号字段错误修改
|
2025-06-20 10:37:38 +08:00 |
|
|
|
e59d05f1e5
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 10:33:38 +08:00 |
|
|
|
0429854814
|
订单号字段错误修改
|
2025-06-20 10:33:32 +08:00 |
|
|
|
ece5feb935
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 10:27:23 +08:00 |
|
|
|
9b6549f141
|
添加关联订单号字段
|
2025-06-20 10:27:00 +08:00 |
|
|
|
d85bfa4fa0
|
修改余量查询错误
|
2025-06-20 10:05:55 +08:00 |
|
|
|
b415537dd7
|
修改余量查询错误
|
2025-06-20 10:05:31 +08:00 |
|
|
|
8f6326bfaf
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 09:42:49 +08:00 |
|
|
|
f612f8ad23
|
补充缺失字段
|
2025-06-20 09:42:14 +08:00 |
|
|
|
3da31de230
|
Merge branch 'dev-lzh' into dev
|
2025-06-19 16:59:34 +08:00 |
|
|
|
fbea508cfe
|
使用真实姓名
|
2025-06-19 16:59:27 +08:00 |
|
|
|
0304b71d8f
|
Merge branch 'sxy' into dev
|
2025-06-19 16:44:57 +08:00 |
|
|
|
33073667e8
|
修改上下架
|
2025-06-19 16:44:38 +08:00 |
|
|
|
41cd63b88a
|
Merge branch 'dev-lzh' into dev
|
2025-06-19 16:36:36 +08:00 |
|
|
|
02d0de5dad
|
使用真实姓名
|
2025-06-19 16:36:28 +08:00 |
|
|
|
44e5c9abe7
|
Merge branch 'sxy' into dev
|
2025-06-19 16:18:53 +08:00 |
|
|
|
ac14519c91
|
修改
|
2025-06-19 16:18:41 +08:00 |
|
|
|
792834ec27
|
Merge branch 'sxy' into dev
|
2025-06-19 16:17:38 +08:00 |
|
|
|
bdc9706125
|
修改
|
2025-06-19 16:16:23 +08:00 |
|
|
|
734c0b2c1f
|
修改
|
2025-06-19 16:12:03 +08:00 |
|
|
|
1d696825d3
|
Merge branch 'sxy' into dev
|
2025-06-19 16:08:56 +08:00 |
|
|
|
3b267ef26f
|
修改h5套餐列表-2
|
2025-06-19 16:08:06 +08:00 |
|
|
|
5394e81a3a
|
Revert "Merge branch 'sxy' into dev"
This reverts commit 988d1342f5, reversing
changes made to f2332671aa.
|
2025-06-19 16:04:48 +08:00 |
|
|
|
988d1342f5
|
Merge branch 'sxy' into dev
|
2025-06-19 16:04:14 +08:00 |
|
|
|
fec7641edb
|
修改h5套餐列表-1
|
2025-06-19 16:04:00 +08:00 |
|
|
|
f2332671aa
|
Merge branch 'dev-lzh' into dev
|
2025-06-19 16:01:37 +08:00 |
|
|
|
0dce0b80a6
|
余量套餐状态添加
|
2025-06-19 16:00:51 +08:00 |
|
|
|
505f459d89
|
Merge branch 'dev-lzh' into dev
|
2025-06-19 15:54:02 +08:00 |
|
|
|
b151326427
|
余量信息电话号码添加
|
2025-06-19 15:53:56 +08:00 |
|
