fiee/micro-bundle
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,908 Commits 45 Branches 7 Tags 34 MiB
dev
Commit Graph

1621 Commits

Author SHA1 Message Date
jiaji.H
824ba26bbc Merge branch 'feat-hjj-Paylater' into dev 2026-06-12 14:10:16 +08:00
jiaji.H
c3f713faa7 Update:更新统计逻辑 2026-06-12 14:10:00 +08:00
JNG
3ef24ece00 Merge branch 'jng' into dev 2026-06-11 16:42:19 +08:00
JNG
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
f2637fd91f Merge branch 'feat-hjj-Paylater' into dev 2026-06-11 13:27:28 +08:00
jiaji.H
72427f8268 fix 2026-06-11 13:27:02 +08:00
jiaji.H
b51a7ac464 Merge branch 'feat-hjj-Paylater' into dev 2026-06-11 13:19:23 +08:00
jiaji.H
24b6506be8 fix 2026-06-11 13:19:07 +08:00
jiaji.H
af292b69eb Merge branch 'feat-hjj-Paylater' into dev 2026-06-11 13:13:31 +08:00
jiaji.H
669e5377bb Update:更新余量字段获取 2026-06-11 13:11:54 +08:00
cjy
518db13616 Merge branch 'feat-cjy-Paylater' into dev 2026-06-11 13:05:18 +08:00
cjy
1572be00a2 调整GetPendingAssignBySubNums与GetArtistUploadStatsList的BundleOrder过滤规则 
- taskStatsQueryOptions 改写:
  * 普通任务分支改为 Case A OR Case B:
    - Case A: order_type=1 AND contract_tpl_type=1 AND status=2 (套餐-普通,仅已签已支付)
    - Case B: order_type=2 AND contract_tpl_type=2 AND status IN (1,2,4) AND pay_later_status IN (1,2) (套餐先用后付存量)
  * 先用后付任务分支保持不变: order_type=2 AND contract_tpl_type=3 AND pay_later_status IN (1,2) AND status IN (1,2,4)
  * 去掉对 order_mode / IFNULL 的依赖,改用 order_type + contract_tpl_type 区分
  * NOT EXISTS 内层 bor2 谓词与外层完全对齐,保持"每用户取最新单"语义
 2026-06-11 13:05:04 +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
cjy
f65061cec8 Merge branch 'feat-cjy-Paylater' into dev 2026-06-11 10:09:49 +08:00
cjy
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
JNG
404538ed40 Merge branch 'jng' into dev 2026-06-10 17:55:44 +08:00
JNG
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
JNG
b5d69179ae 解决冲突 2026-06-10 16:09:22 +08:00
JNG
e78ef82305 添加定时同步订单状态 2026-06-10 16:09:03 +08:00
cjy
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
cjy
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
cjy
0612d11fe5 Merge branch 'feat-cjy-Paylater' into dev 2026-06-10 14:27:07 +08:00
cjy
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
cjy
be1d9e4a61 Merge branch 'feat-cjy-Paylater' into dev 2026-06-10 11:01:03 +08:00
cjy
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
JNG
ede37740ab Merge branch 'jng' into dev 2026-06-09 15:46:01 +08:00
JNG
d03bdbba29 Update orderRecordsLogic.go 2026-06-09 15:45:56 +08:00