|
|
3ef24ece00
|
Merge branch 'jng' into dev
|
2026-06-11 16:42:19 +08:00 |
|
|
|
cbca924899
|
Update bundle_order_records.go
|
2026-06-11 16:42:12 +08:00 |
|
jiaji.H
|
c0001b9751
|
Merge branch 'feat-hjj-Paylater' into dev
|
2026-06-11 16:20:21 +08:00 |
|
jiaji.H
|
0d41e1a0c5
|
Update:更像先用后付合同pdf
|
2026-06-11 16:20:07 +08:00 |
|
jiaji.H
|
e4222aea79
|
Update：解决冲突
|
2026-06-11 09:49:28 +08:00 |
|
jiaji.H
|
3ea4a9f1d8
|
Update:增加先用后付余量列表接口
|
2026-06-10 16:22:36 +08:00 |
|
|
|
b5d69179ae
|
解决冲突
|
2026-06-10 16:09:22 +08:00 |
|
|
|
e78ef82305
|
添加定时同步订单状态
|
2026-06-10 16:09:03 +08:00 |
|
jiaji.H
|
4f3d256091
|
Update：更新支持不同类型的套餐不同的配置
|
2026-06-10 15:25:51 +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 |
|
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 |
|
|
|
ebb9296e2a
|
Merge branch 'feat-cjy-Paylater' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-06-09 13:02:51 +08:00 |
|
jiaji.H
|
132232d183
|
Update：更新pb文件
|
2026-06-09 11:04:33 +08:00 |
|
|
|
26ebd81bcf
|
修改订单创建
|
2026-06-09 10:48:46 +08:00 |
|
jiaji.H
|
375998a746
|
Update:更新余量列表获取
|
2026-06-09 10:39:23 +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 |
|
|
|
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
|
17c8114b47
|
Update:增加字段
|
2026-06-08 11:51:31 +08:00 |
|
jiaji.H
|
d668424ac7
|
Update:增加对应类型
|
2026-06-05 10:58:40 +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 |
|
|
|
ab45e57fd8
|
对账单添加安通流水号
|
2026-03-19 16:51:50 +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
|
3e55413a35
|
Updata：更新sql
|
2026-03-11 19:15:32 +08:00 |
|
jiaji.H
|
332d0a65ff
|
Updata：更新sql
|
2026-03-11 19:12:39 +08:00 |
|
jiaji.H
|
e17a3df63a
|
Updata：更新数据库
|
2026-03-11 18:49:42 +08:00 |
|
jiaji.H
|
9d31ce3d05
|
Updata：增加字段
|
2026-03-11 17:14:15 +08:00 |
|
jiaji.H
|
f548ac9571
|
feat：新增问卷调查模块逻辑
|
2026-03-11 16:17:57 +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 |
|
jiaji.H
|
2369e5c210
|
Updata：解决冲突
|
2026-02-10 15:36:10 +08:00 |
|
jiaji.H
|
513aaf4755
|
Updata：增加付款时间返回值
|
2026-02-10 11:29:28 +08:00 |
|
jiaji.H
|
a78bf365a7
|
Updata：解决冲突
|
2026-02-09 11:29:51 +08:00 |
|
jiaji.H
|
db2b6b6205
|
Updata：解决冲突
|
2026-02-09 11:29:12 +08:00 |
|
|
|
0bba264009
|
解决冲突
|
2026-02-09 11:28:51 +08:00 |
|
jiaji.H
|
5d5127b8e5
|
Updata：修正paytime获取
|
2026-02-06 14:18:01 +08:00 |
|
jiaji.H
|
d83cd6b23c
|
Updata:待确认列表会根据新购还是续费进行过滤
|
2026-02-06 14:04:20 +08:00 |
|
|
|
d60aa877f3
|
feat:待指派任务列表和待指派数量增加上竞品报告的数量
|
2026-02-06 11:55:30 +08:00 |
|
|
|
6ad2d52e9d
|
feat：任务管理台增加竞品报告
|
2026-02-06 11:15:01 +08:00 |
|
