|
|
0bef1ca389
|
Merge branch 'feat-cjy-taskBench'
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-12-01 10:22:47 +08:00 |
|
|
|
e8129eed10
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-12-01 10:05:45 +08:00 |
|
|
|
18530c60cd
|
feat: 增加一个接口
|
2025-11-29 17:00:57 +08:00 |
|
|
|
4152832b11
|
Merge branch 'feat-cjy-taskBench'
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-11-29 13:05:10 +08:00 |
|
|
|
2d0adbedcc
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-11-29 11:02:25 +08:00 |
|
|
|
83a30d6958
|
feat: 新增可指派字段
|
2025-11-28 17:46:41 +08:00 |
|
|
|
3e14262cf4
|
Merge branch 'feat-cjy-taskBench'
# Conflicts:
# pb/bundle.proto
# pb/bundle/bundle.pb.go
# pb/bundle/bundle_triple.pb.go
|
2025-11-28 16:03:59 +08:00 |
|
|
|
3627b64ca5
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-11-28 15:20:33 +08:00 |
|
|
|
88799b6773
|
feat: 最近指派人多返回一个手机号
|
2025-11-28 15:11:37 +08:00 |
|
|
|
79a11cc943
|
feat: 增加隐藏最近指派人功能
|
2025-11-28 13:44:01 +08:00 |
|
jiaji.H
|
e4fd9b48ec
|
Merge branch 'feat-hjj-CastWork#'
|
2025-11-27 18:10:55 +08:00 |
|
jiaji.H
|
93fc705a53
|
Merge branch 'feat-hjj-CastWork#' into dev
|
2025-11-27 17:52:34 +08:00 |
|
|
|
9d43d9b652
|
Merge branch 'feat-cjy-taskBench'
# Conflicts:
# pb/bundle.proto
# pb/bundle/bundle.pb.go
# pb/bundle/bundle.validator.pb.go
# pb/bundle/bundle_triple.pb.go
|
2025-11-27 15:21:14 +08:00 |
|
jiaji.H
|
cb9556329d
|
Updata:更新统计数量对应状态
|
2025-11-26 16:45:50 +08:00 |
|
|
|
8738732b1d
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-11-26 16:26:46 +08:00 |
|
|
|
d92c45efe0
|
feat: 增加分页
|
2025-11-26 16:21:08 +08:00 |
|
|
|
73171ea314
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-11-25 16:18:38 +08:00 |
|
|
|
2f212ec7e8
|
feat: 增加任务回退，删除同步恢复数量
|
2025-11-25 16:17:36 +08:00 |
|
|
|
ddb1d66185
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-11-25 15:01:51 +08:00 |
|
|
|
687b9868a6
|
feat: 待上传列表增加返回艺人过期时间
|
2025-11-25 15:00:33 +08:00 |
|
jiaji.H
|
5760f08792
|
Merge branch 'feat-hjj-CastWork#' into dev
|
2025-11-24 11:57:47 +08:00 |
|
jiaji.H
|
3c1f01fc23
|
Updata:更新余量表检索逻辑
|
2025-11-24 11:56:32 +08:00 |
|
|
|
7ed326615f
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-11-19 16:06:21 +08:00 |
|
|
|
6d48bc68fd
|
feat: 增加返回字段
|
2025-11-19 16:05:36 +08:00 |
|
|
|
3796eea44d
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-11-18 14:09:33 +08:00 |
|
|
|
c0fdc635b6
|
feat: 批量查询艺人待上传套餐和增值视频、图文、数据分析数
|
2025-11-18 13:15:44 +08:00 |
|
|
|
1916c843d4
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# internal/dao/taskDao.go
# pb/bundle.proto
# pb/bundle/bundle.pb.go
# pb/bundle/bundle.validator.pb.go
# pb/bundle/bundle_triple.pb.go
|
2025-11-17 14:55:24 +08:00 |
|
|
|
5110a04bd0
|
feat: 增加待发任务列表的布局接口
|
2025-11-17 14:43:59 +08:00 |
|
|
|
74b0947052
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# internal/dao/taskDao.go
# pb/bundle/bundle.pb.go
|
2025-11-17 11:32:56 +08:00 |
|
jiaji.H
|
dbabaabb0b
|
Updata：解决冲突
|
2025-11-16 18:59:17 +08:00 |
|
jiaji.H
|
792569a22a
|
Updata：修正新增服务金额精度
|
2025-11-16 10:50:27 +08:00 |
|
jiaji.H
|
80ca1c30a5
|
Updata：解决冲突
|
2025-11-14 23:56:41 +08:00 |
|
jiaji.H
|
7533177e1c
|
Updata：修正计算精度问题
|
2025-11-14 23:54:30 +08:00 |
|
jiaji.H
|
121115983d
|
Updata：增加套餐余量开始时间范围查询
|
2025-11-14 17:45:05 +08:00 |
|
|
|
72c4f9dc53
|
feat: 新的需求下的指派记录，增加指派记录数据汇总，多返回实际完成数据展示
|
2025-11-14 16:35:01 +08:00 |
|
|
|
44591aafbe
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-11-14 14:41:55 +08:00 |
|
|
|
2400ba6574
|
feat: 添加导出部分记录为execl功能
|
2025-11-14 14:38:29 +08:00 |
|
|
|
871a4beb4b
|
feat: 添加批量中止任务接口
|
2025-11-14 13:58:57 +08:00 |
|
|
|
bdc4e11420
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# internal/dao/taskDao.go
# internal/model/task.go
# pb/bundle.proto
# pb/bundle/bundle.pb.go
# pb/bundle/bundle_triple.pb.go
|
2025-11-14 10:18:34 +08:00 |
|
|
|
94eca857a4
|
bugfix: 指派时，同时更新最后一次指派人，以及指派时添加任务批次和脚本数
|
2025-11-13 16:35:57 +08:00 |
|
|
|
d3c7f867f6
|
feat: 待上传上传列表接口增加待上传视频脚本数和已上传视频数
|
2025-11-13 11:45:46 +08:00 |
|
|
|
c1502994ff
|
feat: 增加艺人待上传列表接口
|
2025-11-13 11:38:52 +08:00 |
|
|
|
f124e6c008
|
feat: 增加一个接口，根据任务uuid查询任务实际完成状态。同时当任务已实际完成时，不允许中止。
|
2025-11-12 09:07:47 +08:00 |
|
|
|
69ae09bf90
|
feat: 多条件查询指派记录添加排序功能
|
2025-11-11 16:58:03 +08:00 |
|
|
|
31d98fee28
|
feat: 添加中止任务接口
|
2025-11-11 16:13:46 +08:00 |
|
|
|
193ce39906
|
bugfix: 更新 pb文件，以及根据任务批次查询是，只能精准查询，不用模糊查询
|
2025-11-11 15:04:11 +08:00 |
|
|
|
c4f67fd739
|
feat: 批量指派时，添加指派视频脚本数
|
2025-11-11 14:37:01 +08:00 |
|
|
|
94389edf24
|
feat: 任务指派记录添加任务批次、脚本数字段，添加批量指派功能
|
2025-11-11 13:20:30 +08:00 |
|
jiaji.H
|
7d68d6ab5e
|
Updata：解决冲突
|
2025-11-10 10:08:04 +08:00 |
|
|
|
cda83940ce
|
修改汇率单位
|
2025-11-07 13:43:58 +08:00 |
|
jiaji.H
|
8d55cde7f5
|
Updata：更新注释
|
2025-11-07 10:37:01 +08:00 |
|
|
|
3260f00bb7
|
youtube类型换成dm
|
2025-11-06 14:57:33 +08:00 |
|
|
|
68fdc6d374
|
youtube类型换成dm
|
2025-11-06 14:54:33 +08:00 |
|
jiaji.H
|
3c4887ca64
|
Updata：解决冲突
|
2025-11-06 10:04:46 +08:00 |
|
|
|
525a6e5e37
|
添加新的表格数据
|
2025-10-28 16:56:21 +08:00 |
|
|
|
1c4208688a
|
新增当月使用字段
|
2025-10-28 11:05:15 +08:00 |
|
|
|
7698b7bfad
|
解决冲突
|
2025-10-27 13:09:08 +08:00 |
|
jiaji.H
|
ec63f9d3d2
|
Updata：解决冲突
|
2025-10-27 12:02:11 +08:00 |
|
jiaji.H
|
697a27498e
|
Updata：解决冲突
|
2025-10-27 12:01:11 +08:00 |
|
|
|
d1c327c395
|
Merge branch 'feat-cjy-taskBench'
# Conflicts:
# pb/bundle.proto
# pb/bundle/bundle.pb.go
# pb/bundle/bundle_triple.pb.go
# pkg/cron/cron.go
|
2025-10-27 12:00:36 +08:00 |
|
jiaji.H
|
683c2f4f16
|
feat：套餐模块迭代
|
2025-10-27 11:57:53 +08:00 |
|
|
|
89a802a8bf
|
余量导出添加参数
|
2025-10-24 15:01:56 +08:00 |
|
|
|
7748878608
|
bugfix: 实现和余额表同步以及把修改待发数据的接口与申诉合并
|
2025-10-21 20:09:01 +08:00 |
|
|
|
36ef189971
|
补充余量信息字段
|
2025-10-20 16:59:40 +08:00 |
|
|
|
5ec0375d2a
|
补充余量信息字段
|
2025-10-20 16:56:59 +08:00 |
|
|
|
af4ad3339f
|
订单详情添加类型
|
2025-10-20 15:19:59 +08:00 |
|
|
|
4897fbe098
|
修改字段类型
|
2025-10-17 15:59:50 +08:00 |
|
|
|
5269d7e24c
|
bugfix: 根据余额表细分的情况，将任务表细分，并添加任务余额表，不依赖套餐余额
|
2025-10-17 14:25:41 +08:00 |
|
|
|
4939c916ef
|
支持默认布局
|
2025-10-17 13:29:52 +08:00 |
|
|
|
78d1935065
|
添加表格布局存储
|
2025-10-17 10:15:24 +08:00 |
|
|
|
6d0ccb0c9d
|
Merge branch 'main' into feat-cjy-taskBench
# Conflicts:
# pb/bundle/bundle.pb.go
# pb/bundle/bundle_triple.pb.go
|
2025-10-16 16:45:28 +08:00 |
|
|
|
1ba0cce450
|
excel导出接口
|
2025-10-16 16:37:38 +08:00 |
|
|
|
8bdc5982df
|
Merge branch 'dev-lzh-1009' into dev-lzh-0905
|
2025-10-15 15:46:53 +08:00 |
|
|
|
f4d6345707
|
套餐使用情况
|
2025-10-14 16:44:43 +08:00 |
|
|
|
12301aef82
|
余量查询接口
|
2025-10-13 16:44:55 +08:00 |
|
|
|
cae2e19a96
|
添加每月余量更新
|
2025-10-13 14:15:37 +08:00 |
|
|
|
6c5ae80059
|
添加使用类型过滤
|
2025-10-10 14:14:13 +08:00 |
|
|
|
24e1eaed14
|
新增使用类型字段
|
2025-10-10 10:24:20 +08:00 |
|
|
|
422d2acb5a
|
添加使用类型字段
|
2025-10-09 17:09:43 +08:00 |
|
|
|
5edac38772
|
更新proto
|
2025-09-28 14:18:11 +08:00 |
|
|
|
bbd69e32b3
|
Merge branch 'jng' into dev-lzh-0905
|
2025-09-24 15:03:03 +08:00 |
|
|
|
1112d253ee
|
格式化提交时间
|
2025-09-24 11:22:39 +08:00 |
|
|
|
9b37dab44f
|
添加确认时间字段
|
2025-09-23 14:23:24 +08:00 |
|
jiaji.H
|
cf427ec269
|
Updata：解决冲突
|
2025-09-17 11:20:49 +08:00 |
|
jiaji.H
|
5f4e1610d3
|
Updata：增加注释
|
2025-09-17 11:20:01 +08:00 |
|
jiaji.H
|
5fd972942b
|
Updata:订单添加增值服务信息
|
2025-09-17 11:16:22 +08:00 |
|
jiaji.H
|
95a6219fd7
|
Updata：解决冲突
|
2025-09-16 13:47:01 +08:00 |
|
jiaji.H
|
1b9a64068a
|
Upfata：新增套餐字段添加
|
2025-09-16 13:25:32 +08:00 |
|
|
|
ec5abc5fe4
|
解决冲突
|
2025-09-15 19:07:25 +08:00 |
|
|
|
897f375130
|
11
|
2025-09-15 19:07:00 +08:00 |
|
jiaji.H
|
6e2bff33da
|
Updata：解决冲突
|
2025-09-15 15:08:50 +08:00 |
|
jiaji.H
|
7edef20a45
|
feat：返回值中添加服务默认数量
|
2025-09-15 14:55:54 +08:00 |
|
jiaji.H
|
75de934c4f
|
feat：新增加服务添加是否默认选项
|
2025-09-15 14:33:26 +08:00 |
|
jiaji.H
|
bca70c5493
|
Updata：解决冲突
|
2025-09-11 15:32:15 +08:00 |
|
jiaji.H
|
9635ec4572
|
Updata：区分套餐权益和附加权益
|
2025-09-11 14:54:21 +08:00 |
|
|
|
0dcbb3a057
|
解决冲突
|
2025-09-11 14:54:12 +08:00 |
|
|
|
64c56d5ca3
|
单价模式新加总价字段
|
2025-09-11 14:47:07 +08:00 |
|
jiaji.H
|
4d42019882
|
feat：分类权益
|
2025-09-10 13:55:41 +08:00 |
|
jiaji.H
|
5d47d6f1a9
|
feat:解决冲突
|
2025-09-09 11:02:31 +08:00 |
|
jiaji.H
|
2461bb8a93
|
feat：修改服务列表额度字段逻辑
|
2025-09-09 10:59:23 +08:00 |
|
