|
|
e82cfd8861
|
优化查询速度
|
2026-02-13 09:49:41 +08:00 |
|
|
|
58bb294435
|
fix:增加排序键，防止批量指派时operator_time的时间一致
|
2026-02-12 18:33:30 +08:00 |
|
|
|
e16e8e49b8
|
fix:不再联表
# Conflicts:
# internal/dao/taskDao.go
|
2026-02-12 16:39:45 +08:00 |
|
|
|
a2112f9026
|
Merge branch 'feat-cjy-taskBench' into dev
|
2026-02-11 16:24:45 +08:00 |
|
|
|
571dc8f5a9
|
fix: 修复查询失败
|
2026-02-11 16:24:37 +08:00 |
|
|
|
bc6e37bb13
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-02-11 16:17:32 +08:00 |
|
|
|
7ce953fd5c
|
fix:不再关联实名表，提高查询速度
|
2026-02-11 16:16:54 +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
|
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 |
|
jiaji.H
|
daccf29f02
|
Updata：增加更新发票url接口
|
2026-02-10 10:48:25 +08:00 |
|
jiaji.H
|
3d6a6cc1b7
|
Updata：修正sql
|
2026-02-10 09:54:45 +08:00 |
|
jiaji.H
|
39a9518d08
|
Updata：增加金额的精度计算
|
2026-02-10 09:37:51 +08:00 |
|
jiaji.H
|
b851f1a7dc
|
Updata：修改获取最后一张发票的编号逻辑
|
2026-02-09 15:44:28 +08:00 |
|
jiaji.H
|
99ff0eee12
|
Updata：增加id倒叙排列
|
2026-02-09 15:38:41 +08:00 |
|
jiaji.H
|
c8b201a47d
|
Updata：增加空值判断
|
2026-02-09 15:23:02 +08:00 |
|
|
|
d2f556ff52
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle.proto
# pb/bundle/bundle.pb.go
# pb/bundle/bundle_triple.pb.go
|
2026-02-09 10:36:49 +08:00 |
|
|
|
285bddad15
|
feat：增加一个接口，获取最除非续费订单的套餐开始时间
# Conflicts:
# internal/dao/orderRecordsDao.go
# pb/bundle/bundle.pb.go
|
2026-02-06 16:27:52 +08:00 |
|
jiaji.H
|
f6bcbb2fa1
|
Merge branch 'jng' into dev
|
2026-02-06 14:18:13 +08:00 |
|
jiaji.H
|
d83cd6b23c
|
Updata:待确认列表会根据新购还是续费进行过滤
|
2026-02-06 14:04:20 +08:00 |
|
|
|
b764722fab
|
feat: 查询任务完成日志，根据任务的uuid查询对应作品的uuid列表
|
2026-02-06 13:41:31 +08:00 |
|
|
|
d60aa877f3
|
feat:待指派任务列表和待指派数量增加上竞品报告的数量
|
2026-02-06 11:55:30 +08:00 |
|
|
|
898b9ca9c5
|
Revert "feat:产品需要待上传视频脚本和待指派视频脚本的数量减掉2025年上传的视频数"
This reverts commit deb68e25a9.
|
2026-02-06 11:16:23 +08:00 |
|
|
|
6ad2d52e9d
|
feat：任务管理台增加竞品报告
|
2026-02-06 11:15:01 +08:00 |
|
|
|
deb68e25a9
|
feat:产品需要待上传视频脚本和待指派视频脚本的数量减掉2025年上传的视频数
|
2026-02-06 09:44:42 +08:00 |
|
jiaji.H
|
40fd5345c1
|
Merge branch 'jng' into dev
|
2026-02-05 15:05:22 +08:00 |
|
jiaji.H
|
85bceb0af9
|
Updata:更新新建余量信息
|
2026-02-05 15:04:20 +08:00 |
|
jiaji.H
|
be2f8316e2
|
Merge branch 'feat-hjj-ExportBat'
|
2026-02-04 15:23:28 +08:00 |
|
jiaji.H
|
6676bdbe2a
|
Updata：更新查询sql
|
2026-02-04 15:23:20 +08:00 |
|
jiaji.H
|
4a37beca0a
|
Merge branch 'feat-hjj-ExportBat'
|
2026-02-04 13:48:26 +08:00 |
|
jiaji.H
|
a2e8d98cee
|
Updata：增加类型选择
|
2026-02-04 13:33:16 +08:00 |
|
jiaji.H
|
dc55fa5dfe
|
Updata：解决冲突
|
2026-02-04 13:22:16 +08:00 |
|
jiaji.H
|
f7271ee292
|
Updata：更新字段
|
2026-02-04 13:17:29 +08:00 |
|
|
|
e7188528f0
|
Merge branch 'feat-zjy-fixbug-033' into dev
|
2026-02-04 13:15:38 +08:00 |
|
|
|
9ddb7e8276
|
fix: 调整创建订单的uuid
|
2026-02-04 13:15:18 +08:00 |
|
|
|
00460ed290
|
Merge branch 'feat-zjy-fixbug-033' into dev
|
2026-02-04 13:09:05 +08:00 |
|
|
|
151abc145b
|
fix: 调整创建订单的uuid
|
2026-02-04 13:08:18 +08:00 |
|
|
|
a822149b30
|
Merge branch 'feat-zjy-fixbug-033' into dev
# Conflicts:
# internal/logic/orderRecordsLogic.go
# pb/bundle.proto
# pb/bundle/bundle.pb.go
# pb/bundle/bundle.validator.pb.go
# pb/bundle/bundle_triple.pb.go
|
2026-02-04 12:17:23 +08:00 |
|
|
|
2155d56187
|
fix: 调整创建订单的uuid
|
2026-02-04 12:13:00 +08:00 |
|
|
|
ac9bee2a83
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-02-04 11:26:46 +08:00 |
|
|
|
6ef896b009
|
fix: rizhi
|
2026-02-04 11:26:30 +08:00 |
|
jiaji.H
|
c500eeec84
|
Updata:解决冲突
|
2026-02-04 11:16:38 +08:00 |
|
jiaji.H
|
36a134a1e8
|
Updata：增加是否续费
|
2026-02-04 11:15:19 +08:00 |
|
jiaji.H
|
ef3dd698e5
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-04 10:46:45 +08:00 |
|
