|
|
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 |
|
|
|
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
|
307905849b
|
Update
|
2026-06-08 14:04:31 +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
|
f9c7edf7c3
|
Update:增加字段赋值
|
2026-06-05 13:36:32 +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 |
|
jiaji.H
|
f2eb757c67
|
Update
|
2026-06-04 15:40:27 +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 |
|
|
|
89c1582bac
|
Update:任务管理台三表新增bundle_task_type字段,支持先用后付任务区分
|
2026-06-04 14:15:56 +08:00 |
|
jiaji.H
|
2fd6a2429c
|
Update:更新字段
|
2026-06-03 17:09:53 +08:00 |
|
jiaji.H
|
7df0804b3d
|
Update:调整字段位置
|
2026-06-03 17:00:00 +08:00 |
|
jiaji.H
|
ffbb174857
|
Update:增加字段
|
2026-06-03 16:45:55 +08:00 |
|
jiaji.H
|
eb8d7ca118
|
Update:更新手动扩展使用类型
|
2026-05-20 09:25:11 +08:00 |
|
|
|
15da904d9c
|
fix: 设置字符集
|
2026-04-28 10:27:06 +08:00 |
|
|
|
fdd52f380d
|
feat: 优化查询效率
|
2026-04-27 19:39:48 +08:00 |
|
|
|
a88fc1a16d
|
fix: 修复与查询列表不一致的问题
|
2026-04-24 16:37:02 +08:00 |
|
|
|
aca2bdce7a
|
fix: 不要转换时间戳
|
2026-04-24 15:25:23 +08:00 |
|
jiaji.H
|
8079b490fc
|
Update:解决冲突
|
2026-04-13 11:08:52 +08:00 |
|
|
|
3e06c9b420
|
添加搜索
|
2026-03-20 10:04:51 +08:00 |
|
|
|
4792f94752
|
Update orderRecordsDao.go
|
2026-03-20 09:55:11 +08:00 |
|
|
|
ab45e57fd8
|
对账单添加安通流水号
|
2026-03-19 16:51:50 +08:00 |
|
jiaji.H
|
22b720434b
|
Merge branch 'feat-hjj-MetricsManager#260226'
|
2026-03-19 14:45:43 +08:00 |
|
jiaji.H
|
8ca0d6ce75
|
Updata:更新查询sql
|
2026-03-19 14:45:17 +08:00 |
|
jiaji.H
|
f6577ab7f7
|
Merge branch 'feat-hjj-MetricsManager#260226'
|
2026-03-19 14:39:34 +08:00 |
|
jiaji.H
|
1b7898c7fd
|
Updata:修正sql错误
|
2026-03-19 14:39:07 +08:00 |
|
jiaji.H
|
2887282020
|
Merge branch 'feat-hjj-MetricsManager#260226'
|
2026-03-19 14:31:58 +08:00 |
|
jiaji.H
|
b9d3b7db38
|
Updata:更新作品确认状态判定
|
2026-03-19 14:30:06 +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
|
2d1fe66d90
|
Updata:增加电话号码映射表
|
2026-03-13 13:19:43 +08:00 |
|
jiaji.H
|
e5daac90f7
|
Updata:增加测试艺人id
|
2026-03-13 10:38:53 +08:00 |
|
jiaji.H
|
651f12d8d7
|
Updata:增加问卷调查白名单
|
2026-03-12 13:37:08 +08:00 |
|
jiaji.H
|
b91f06d240
|
Updata:更新发送问卷逻辑
|
2026-03-11 22:03:54 +08:00 |
|
jiaji.H
|
cb575bb37c
|
Updata:更新效验规则
|
2026-03-11 21:48:51 +08:00 |
|
jiaji.H
|
fbf74734c6
|
Updata:更新增值获取数
|
2026-03-11 21:42:51 +08:00 |
|
jiaji.H
|
b041c5ce2d
|
Updata:更新数据结构
|
2026-03-11 19:50:06 +08:00 |
|
jiaji.H
|
090d1ac8cc
|
Updata:更新字段
|
2026-03-11 19:37:32 +08:00 |
|
jiaji.H
|
96e5872c78
|
Updata:更新结构
|
2026-03-11 19:33:47 +08:00 |
|
jiaji.H
|
5fef6272c3
|
Updata:增加中间数据结构
|
2026-03-11 19:31:13 +08:00 |
|
jiaji.H
|
1ff83504c2
|
Updata:更新赋值
|
2026-03-11 19:20:50 +08:00 |
|
jiaji.H
|
3e55413a35
|
Updata:更新sql
|
2026-03-11 19:15:32 +08:00 |
|