|
|
0612d11fe5
|
Merge branch 'feat-cjy-Paylater' into dev
|
2026-06-10 14:27:07 +08:00 |
|
|
|
038f07f5af
|
fix: 优化任务管理台列表的查询速度
|
2026-06-10 14:26:51 +08:00 |
|
jiaji.H
|
a318e2fe15
|
Update:解决冲突
|
2026-06-10 13:46:52 +08:00 |
|
jiaji.H
|
a10e13c642
|
Update：更新pb文件
|
2026-06-10 13:45:30 +08:00 |
|
jiaji.H
|
69f58214e6
|
Update：解决冲突
|
2026-06-10 13:24:57 +08:00 |
|
jiaji.H
|
debafff038
|
Update:增加先用后付合同
|
2026-06-10 13:22:07 +08:00 |
|
|
|
be1d9e4a61
|
Merge branch 'feat-cjy-Paylater' into dev
|
2026-06-10 11:01:03 +08:00 |
|
|
|
9aa2bf6459
|
fix: 根据视频和视频脚本里面的uuid来判断每个视频脚本属于哪个一个增值套餐的里面，避免订单逾期未支付导致统计上传视频数量错误的问题
|
2026-06-10 11:00:49 +08:00 |
|
jiaji.H
|
2353dd6db8
|
Update：解决冲突
|
2026-06-10 10:57:45 +08:00 |
|
jiaji.H
|
f6127e87a3
|
Update：更新pb文件
|
2026-06-10 10:54:40 +08:00 |
|
|
|
ede37740ab
|
Merge branch 'jng' into dev
|
2026-06-09 15:46:01 +08:00 |
|
|
|
d03bdbba29
|
Update orderRecordsLogic.go
|
2026-06-09 15:45:56 +08:00 |
|
|
|
94a453c443
|
Merge branch 'jng' into dev
|
2026-06-09 15:31:50 +08:00 |
|
|
|
bae837417d
|
Update orderRecordsLogic.go
|
2026-06-09 15:31:41 +08:00 |
|
|
|
b5cc3485d0
|
修改
|
2026-06-09 14:51:04 +08:00 |
|
|
|
86eac0df6a
|
添加个人订单查询
|
2026-06-09 14:50:32 +08:00 |
|
|
|
14180ae716
|
Merge branch 'jng' into dev
|
2026-06-09 13:51:31 +08:00 |
|
|
|
a9738b1bc8
|
修改
|
2026-06-09 13:51:25 +08:00 |
|
|
|
0c67ee0f0e
|
Merge branch 'feat-cjy-Paylater' into dev
|
2026-06-09 13:25:55 +08:00 |
|
|
|
d94afe2ab7
|
fix:修改字段错误
|
2026-06-09 13:25:47 +08:00 |
|
|
|
ebb9296e2a
|
Merge branch 'feat-cjy-Paylater' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-06-09 13:02:51 +08:00 |
|
|
|
d8be4ec11d
|
更新pb
|
2026-06-09 12:28:21 +08:00 |
|
|
|
8a19225eb5
|
Update：任务台订单过滤按 contract_tpl_type 拆分支
- 先用后付分支：仅取 contract_tpl_type=3 的增值先用后付订单
- 普通任务分支：追加 contract_tpl_type=2 的套餐先用后付主订单
- latestOrderFilter 同步纳入两类订单的「较新订单」比较
- 修正 06fb278 中「套餐先用后付主订单被错算成先用后付任务」的问题
|
2026-06-09 12:26:24 +08:00 |
|
|
|
6a19546e35
|
Merge branch 'jng' into dev
|
2026-06-09 11:07:29 +08:00 |
|
|
|
87fc823c1c
|
Update mysql.go
|
2026-06-09 11:07:22 +08:00 |
|
jiaji.H
|
132232d183
|
Update：更新pb文件
|
2026-06-09 11:04:33 +08:00 |
|
|
|
3bcb98d91f
|
Merge branch 'jng' into dev
|
2026-06-09 10:49:06 +08:00 |
|
|
|
26ebd81bcf
|
修改订单创建
|
2026-06-09 10:48:46 +08:00 |
|
jiaji.H
|
375998a746
|
Update:更新余量列表获取
|
2026-06-09 10:39:23 +08:00 |
|
|
|
06fb278dcc
|
Update：任务管理台统计接入先用后付维度
- proto/dto: TaskQueryRequest、BatchAssignTaskItem、PendingAssignRequest
新增 bundle_task_type 字段；dto 拆出 PendingAssignQueryRequest
- 艺人上传统计/可指派数量查询：抽出 target_orders + active_order_balances
作为共享 CTE，普通套餐仍按"每用户最新一单"过滤，先用后付按
pay_later_status IN (1,2) 取全部有效单，并在 active_windows 里
按 user_id 聚合多条先用后付订单的配额
- cast_work（视频）和 cast_video_script 统计按 billing_type 过滤，
task_assign_records / task_management 按 bundle_task_type 过滤，
AssignTask / BatchAssignTasks / CompleteTaskManually /
GetArtistTaskStatsBySubNum 全部加入 bundle_task_type 维度
- 顺手修 pkg/db/mysql.go 里 fmt.Println 用了 %s 占位符不生效的问题
|
2026-06-09 10:28:51 +08:00 |
|
|
|
0a1878e5ae
|
Merge branch 'jng' into feat-cjy-Paylater
# Conflicts:
# internal/logic/bundleLogic.go
# pb/bundle/bundle.pb.go
# pb/bundle/bundle_triple.pb.go
|
2026-06-09 09:38:13 +08:00 |
|
|
|
4a867d2a97
|
Merge branch 'feat-hjj-Paylater' into feat-cjy-Paylater
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-06-09 09:31:33 +08:00 |
|
jiaji.H
|
6a313329e8
|
Update：增加订单过滤插叙
|
2026-06-08 19:25:54 +08:00 |
|
jiaji.H
|
46cea10a5e
|
Update：增加查询指定用户未过期的订单列表
|
2026-06-08 19:17:52 +08:00 |
|
|
|
beb03ba82c
|
解决冲突
|
2026-06-08 17:10:48 +08:00 |
|
|
|
d18a5243f2
|
订单新增先用后付
|
2026-06-08 17:08:04 +08:00 |
|
|
|
c4e525dc24
|
update: 更新cast_work表
|
2026-06-08 16:23:13 +08:00 |
|
|
|
36a6e82fae
|
update: 更新cast_work表和video_script 表结构
|
2026-06-08 16:16:39 +08:00 |
|
jiaji.H
|
1c40f5247b
|
Update：解决冲突
|
2026-06-08 14:05:24 +08:00 |
|
jiaji.H
|
307905849b
|
Update
|
2026-06-08 14:04:31 +08:00 |
|
jiaji.H
|
1d8de45c54
|
fix：修正代码
|
2026-06-08 13:52:49 +08:00 |
|
jiaji.H
|
2f0cb21930
|
Update：解决冲突
|
2026-06-08 11:55:42 +08:00 |
|
jiaji.H
|
17c8114b47
|
Update:增加字段
|
2026-06-08 11:51:31 +08:00 |
|
|
|
a6a9b9197c
|
fix: 修改zap记录日志错误的问题
|
2026-06-05 14:44:07 +08:00 |
|
jiaji.H
|
56a4388ff4
|
Merge branch 'feat-hjj-Paylater' into dev
|
2026-06-05 13:36:46 +08:00 |
|
jiaji.H
|
f9c7edf7c3
|
Update:增加字段赋值
|
2026-06-05 13:36:32 +08:00 |
|
jiaji.H
|
d573e7cebf
|
Merge branch 'feat-hjj-Paylater' into dev
|
2026-06-05 11:02:53 +08:00 |
|
jiaji.H
|
20f94743d4
|
Merge branch 'feat-hjj-Paylater' of http://gitea.tools.fontree.cn:3000/fiee/micro-bundle into feat-hjj-Paylater
|
2026-06-05 11:02:00 +08:00 |
|
jiaji.H
|
d668424ac7
|
Update:增加对应类型
|
2026-06-05 10:58:40 +08:00 |
|
|
|
235bea33ff
|
Update:任务工作日志接入bundleTaskType,支持写入/查询过滤/返回
|
2026-06-04 16:05:11 +08:00 |
|
