|
|
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 |
|
|
|
3bcb98d91f
|
Merge branch 'jng' into dev
|
2026-06-09 10:49:06 +08:00 |
|
|
|
26ebd81bcf
|
修改订单创建
|
2026-06-09 10:48:46 +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 |
|
jiaji.H
|
2f0cb21930
|
Update：解决冲突
|
2026-06-08 11:55:42 +08:00 |
|
jiaji.H
|
17c8114b47
|
Update:增加字段
|
2026-06-08 11:51:31 +08:00 |
|
jiaji.H
|
d573e7cebf
|
Merge branch 'feat-hjj-Paylater' into dev
|
2026-06-05 11:02:53 +08:00 |
|
|
|
235bea33ff
|
Update:任务工作日志接入bundleTaskType,支持写入/查询过滤/返回
|
2026-06-04 16:05:11 +08:00 |
|
|
|
239b97b759
|
Update:任务管理台接入bundleTaskType,支持指派时设置与查询过滤
- proto: 新增 enum BundleTaskType,4 个相关 message 加字段
- model: 新增 BundleTaskTypeNormal/PayLater 常量
- dto: TaskAssignRequest / EmployeeTaskQueryRequest /
TaskAssignRecordsQueryRequest / TaskAssignRecordsResponse
新增 BundleTaskType 字段
- controller: 3 个方法做 proto→dto 映射,响应带回该字段
- logic: 3 个查询返回路径的 DTO 映射补字段
- dao: AssignTask 写入字段(新建/更新 task_management,
新建 task_assign_records);GetEmployeeAssignedTasks 的 Select
加列、Where 加条件;GetTaskAssignRecordsList 列表与汇总查询
两处都加 Where 条件
|
2026-06-04 15:37:50 +08:00 |
|
jiaji.H
|
acdd67e0ae
|
Update:增加套餐类型
|
2026-06-04 14:26:32 +08:00 |
|
jiaji.H
|
ddc8f5b893
|
Merge branch 'feat-hjj-Paylater' into dev
|
2026-06-03 16:50:37 +08:00 |
|
jiaji.H
|
ffbb174857
|
Update:增加字段
|
2026-06-03 16:45:55 +08:00 |
|
jiaji.H
|
8079b490fc
|
Update：解决冲突
|
2026-04-13 11:08:52 +08:00 |
|
|
|
92fa37f8a4
|
Merge branch 'jng' into dev
|
2026-03-20 10:05:09 +08:00 |
|
|
|
3e06c9b420
|
添加搜索
|
2026-03-20 10:04:51 +08:00 |
|
|
|
92c4584352
|
解决冲突
|
2026-03-19 16:52:25 +08:00 |
|
|
|
ab45e57fd8
|
对账单添加安通流水号
|
2026-03-19 16:51:50 +08:00 |
|
jiaji.H
|
2d6ac75f42
|
Updata：解决冲突
|
2026-03-16 09:59:46 +08:00 |
|
jiaji.H
|
ea278571d8
|
Updata：增加地址字段
|
2026-03-16 09:58:41 +08:00 |
|
jiaji.H
|
59db1008f4
|
Updata：更新字段
|
2026-03-16 09:10:33 +08:00 |
|
jiaji.H
|
4e00253541
|
Updata;解决冲突
|
2026-03-11 18:43:47 +08:00 |
|
jiaji.H
|
a21668b585
|
Updata：更新sql
|
2026-03-11 18:42:50 +08:00 |
|
jiaji.H
|
c989ca46c3
|
Updata：解决冲突
|
2026-03-11 17:24:46 +08:00 |
|
jiaji.H
|
23b996bfd5
|
Updata：增加字段
|
2026-03-11 17:24:15 +08:00 |
|
jiaji.H
|
5bba22d18a
|
Updata：增加字段
|
2026-03-11 17:16:57 +08:00 |
|
jiaji.H
|
8297b006dc
|
Updata：解决冲突
|
2026-03-11 17:16:09 +08:00 |
|
jiaji.H
|
9d31ce3d05
|
Updata：增加字段
|
2026-03-11 17:14:15 +08:00 |
|
jiaji.H
|
c8a5f27ad0
|
Updata：解决冲突
|
2026-03-11 17:05:28 +08:00 |
|
jiaji.H
|
447cbff99e
|
Updata：更新pb文件
|
2026-03-11 17:04:49 +08:00 |
|
jiaji.H
|
5ec92819ea
|
Updata：解决冲突
|
2026-03-11 16:29:23 +08:00 |
|
jiaji.H
|
f548ac9571
|
feat：新增问卷调查模块逻辑
|
2026-03-11 16:17:57 +08:00 |
|
jiaji.H
|
f5cb5050cf
|
Updata：解决冲突
|
2026-02-26 15:35:28 +08:00 |
|
|
|
bd8fbfb292
|
Merge branch 'feat-cjy-taskBench'
# Conflicts:
# internal/dao/taskDao.go
# pb/bundle/bundle.pb.go
# pb/bundle/bundle_triple.pb.go
|
2026-02-13 10:10:17 +08:00 |
|
|
|
94445e0ea8
|
Revert "fix: 待确认列表新增返回字段"
This reverts commit 5dc2538a50.
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-02-11 15:36:27 +08:00 |
|
|
|
eeb6616636
|
Revert "fix: 待确认列表新增返回字段"
This reverts commit 5dc2538a50.
|
2026-02-11 15:35:44 +08:00 |
|
|
|
6aaa8f3618
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-02-11 14:01:39 +08:00 |
|
|
|
5dc2538a50
|
fix: 待确认列表新增返回字段
|
2026-02-11 14:01:08 +08:00 |
|
|
|
59b0342478
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-02-10 16:37:11 +08:00 |
|
|
|
138a109223
|
fix:不再查询订单获取艺人uuid
|
2026-02-10 16:36:00 +08:00 |
|
jiaji.H
|
2369e5c210
|
Updata：解决冲突
|
2026-02-10 15:36:10 +08:00 |
|
jiaji.H
|
acc76444b5
|
Updata：解决冲突
|
2026-02-10 11:34:37 +08:00 |
|
jiaji.H
|
513aaf4755
|
Updata：增加付款时间返回值
|
2026-02-10 11:29:28 +08:00 |
|
jiaji.H
|
10c01b910a
|
Updata：增加订单编号检索
|
2026-02-10 11:16:57 +08:00 |
|
