jiaji.H
|
9d557bef95
|
Update：更新pb文件
|
2026-06-11 11:51:56 +08:00 |
|
jiaji.H
|
37dfb2e711
|
Merge branch 'feat-hjj-Paylater' into dev
|
2026-06-11 11:50:49 +08:00 |
|
jiaji.H
|
48e0bdd93d
|
Update：更新创建余量逻辑
|
2026-06-11 11:50:38 +08:00 |
|
jiaji.H
|
e7094e0978
|
Update:修改创建余量接口
|
2026-06-11 11:47:42 +08:00 |
|
jiaji.H
|
060510ce5f
|
Merge branch 'feat-hjj-Paylater' into dev
|
2026-06-11 11:27:21 +08:00 |
|
jiaji.H
|
7a870a641b
|
Update：修复字段
|
2026-06-11 11:27:12 +08:00 |
|
jiaji.H
|
553e62ba4c
|
Merge branch 'feat-hjj-Paylater' into dev
|
2026-06-11 11:20:51 +08:00 |
|
jiaji.H
|
cd4c003bcd
|
Update：更新检索
|
2026-06-11 11:20:38 +08:00 |
|
jiaji.H
|
0ed48e789d
|
Update：解决冲突
|
2026-06-11 11:03:01 +08:00 |
|
jiaji.H
|
8e52bba692
|
Update:增加月份筛选
|
2026-06-11 11:01:11 +08:00 |
|
jiaji.H
|
8efae21524
|
Update：增加先用后付余量出
|
2026-06-11 10:27:32 +08:00 |
|
|
|
f65061cec8
|
Merge branch 'feat-cjy-Paylater' into dev
|
2026-06-11 10:09:49 +08:00 |
|
|
|
6d5b96a7d0
|
优化GetPendingAssignBySubNums查询速度
|
2026-06-11 10:09:40 +08:00 |
|
jiaji.H
|
e4222aea79
|
Update：解决冲突
|
2026-06-11 09:49:28 +08:00 |
|
jiaji.H
|
4b7c56d1b6
|
Update：增加过滤
|
2026-06-11 09:48:43 +08:00 |
|
|
|
404538ed40
|
Merge branch 'jng' into dev
|
2026-06-10 17:55:44 +08:00 |
|
|
|
4afb524a8b
|
修改订单编号
|
2026-06-10 17:55:37 +08:00 |
|
jiaji.H
|
ae3d62ff24
|
Update：使用记录增加套餐类型过滤
|
2026-06-10 17:46:45 +08:00 |
|
jiaji.H
|
bb30a04163
|
Update：更新查询逻辑
|
2026-06-10 17:20:14 +08:00 |
|
jiaji.H
|
45385724d1
|
Update:更新查询逻辑
|
2026-06-10 17:17:00 +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 |
|
|
|
23d1bacd5f
|
Merge branch 'feat-cjy-Paylater' into dev
|
2026-06-10 15:52:10 +08:00 |
|
jiaji.H
|
4f3d256091
|
Update：更新支持不同类型的套餐不同的配置
|
2026-06-10 15:25:51 +08:00 |
|
|
|
590f0dedd6
|
test: 为 taskDao 与 taskLogic 添加单元测试
新增 internal/testutil/db.go，基于 DATA-DOG/go-sqlmock 提供
SetupTaskBenchDB 帮助函数，把 mock 出来的 *gorm.DB 挂到
app.ModuleClients.TaskBenchDB 上，方便 dao / logic 层单测。
SQL 匹配使用 QueryMatcherRegexp，避免对 gorm 生成的 SQL 字面量
（字段顺序、占位符数量等）过度耦合。
- internal/dao/taskDao_test.go：覆盖 GetPendingTaskLayout 等
DAO 方法的 SQL 行为与错误分支。
- internal/logic/taskLogic_test.go：覆盖 CreateTaskWorkLog
的入参范围校验分支。
go.mod / go.sum：
- 新增直接依赖 github.com/DATA-DOG/go-sqlmock v1.5.2、
github.com/stretchr/testify v1.11.1；
- 调整 google/uuid、robfig/cron/v3、satori/go.uuid 为直接依赖。
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
|
2026-06-10 15:21:03 +08:00 |
|
|
|
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 |
|
