|
|
40675cae21
|
fix: 改为秒级时间戳
|
2026-02-09 11:39:03 +08:00 |
|
|
|
7b39f34a43
|
feat：增加一个接口，获取最除非续费订单的套餐开始时间
# Conflicts:
# internal/dao/orderRecordsDao.go
# pb/bundle/bundle.pb.go
|
2026-02-09 11:38:16 +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 |
|
|
|
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 |
|
|
|
3287f7c66e
|
fix: 改为秒级时间戳
|
2026-02-06 17:52:02 +08:00 |
|
|
|
285bddad15
|
feat：增加一个接口，获取最除非续费订单的套餐开始时间
# Conflicts:
# internal/dao/orderRecordsDao.go
# pb/bundle/bundle.pb.go
|
2026-02-06 16:27:52 +08:00 |
|
jiaji.H
|
4fc597520d
|
Merge branch 'jng' into dev
|
2026-02-06 15:14:59 +08:00 |
|
jiaji.H
|
ed13b84ecc
|
Updata:修正第一个月余量发放
|
2026-02-06 15:14:47 +08:00 |
|
jiaji.H
|
f6bcbb2fa1
|
Merge branch 'jng' into dev
|
2026-02-06 14:18:13 +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 |
|
|
|
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 |
|
|
|
9ee3e15938
|
feat:增加竞品报告的相关字段
|
2026-02-06 09:19:38 +08:00 |
|
|
|
72f23c58b6
|
fix: 移除没用的表
|
2026-02-06 09:17:33 +08:00 |
|
|
|
4d56bab91d
|
fix:日志添加竞品报告和视频脚本
|
2026-02-05 15:37:39 +08:00 |
|
|
|
719d81347d
|
fix:日志添加竞品报告和视频脚本
|
2026-02-05 15:36:46 +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
|
0f4b7e5a72
|
Merge branch 'jng' into dev
|
2026-02-04 16:57:52 +08:00 |
|
jiaji.H
|
94990cadbc
|
Updata:修正bug
|
2026-02-04 16:56:54 +08:00 |
|
jiaji.H
|
48b3caefbf
|
Merge branch 'jng' into dev
|
2026-02-04 16:18:55 +08:00 |
|
jiaji.H
|
7c99427a4d
|
Updata：增加log
|
2026-02-04 16:18:44 +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 |
|
|
|
1809d98cdb
|
Update orderRecordsLogic.go
|
2026-02-04 11:15:04 +08:00 |
|
jiaji.H
|
ef3dd698e5
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-04 10:46:45 +08:00 |
|
jiaji.H
|
deaac40fad
|
Updata：更新发票时间检索
|
2026-02-04 10:46:38 +08:00 |
|
jiaji.H
|
3dac79736b
|
Updata：解决冲突
|
2026-02-04 10:26:37 +08:00 |
|
jiaji.H
|
f219ed3b05
|
Updata：更新字段
|
2026-02-04 10:23:11 +08:00 |
|
jiaji.H
|
013c14b9f7
|
Updata：增加获取最新发票编辑号接口
|
2026-02-04 10:18:50 +08:00 |
|
jiaji.H
|
fe4357f246
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-04 09:48:32 +08:00 |
|
jiaji.H
|
18e341edce
|
Updata：更新时间排序
|
2026-02-04 09:48:07 +08:00 |
|
|
|
cde554ecbd
|
Merge branch 'feat-cjy-customerContract'
# Conflicts:
# pb/bundle.proto
# pb/bundle/bundle.pb.go
# pb/bundle/bundle.validator.pb.go
# pb/bundle/bundle_triple.pb.go
|
2026-02-04 09:40:22 +08:00 |
|
|
|
cae38a028c
|
Merge branch 'jng' into dev
|
2026-02-04 09:38:33 +08:00 |
|
jiaji.H
|
911ac27b72
|
Updata：增加续费用户账号使用逻辑
|
2026-02-04 09:37:26 +08:00 |
|
|
|
01753b9735
|
Merge branch 'jng' into dev
|
2026-02-03 16:46:46 +08:00 |
|
|
|
4f3fcb8206
|
修改
|
2026-02-03 16:46:33 +08:00 |
|
jiaji.H
|
90362ac91e
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 16:04:32 +08:00 |
|
jiaji.H
|
d9b425bba1
|
Updata：增加不太类型时间格式兼容
|
2026-02-03 16:04:23 +08:00 |
|
jiaji.H
|
e5ced3709e
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 15:44:25 +08:00 |
|
jiaji.H
|
275ee0376f
|
Updata：更新sql
|
2026-02-03 15:44:10 +08:00 |
|
jiaji.H
|
1bfe928434
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 15:00:40 +08:00 |
|
jiaji.H
|
be45f91971
|
Updata：修改时间解析
|
2026-02-03 15:00:32 +08:00 |
|
jiaji.H
|
8e4fd35b8d
|
Updata：解决冲突
|
2026-02-03 14:30:54 +08:00 |
|
jiaji.H
|
c149bc1af5
|
Updata：更新时间解析
|
2026-02-03 14:30:26 +08:00 |
|
jiaji.H
|
0c0ec5f61d
|
Updata：增加log
|
2026-02-03 14:13:04 +08:00 |
|
jiaji.H
|
7df8cfa8cb
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 13:59:56 +08:00 |
|
jiaji.H
|
b8dcfafe7e
|
Updata：列表倒叙排序
|
2026-02-03 13:59:49 +08:00 |
|
jiaji.H
|
23ea832e31
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 13:26:31 +08:00 |
|
jiaji.H
|
c25d7dbdb0
|
Updata：更新字段类型
|
2026-02-03 13:26:23 +08:00 |
|
jiaji.H
|
98ab8f5ffb
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 13:18:01 +08:00 |
|
jiaji.H
|
24423900d3
|
Updata:更新检索sql
|
2026-02-03 13:17:48 +08:00 |
|
jiaji.H
|
455d09f14a
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 13:11:22 +08:00 |
|
jiaji.H
|
40bd33d19c
|
Updata:修正sql
|
2026-02-03 13:11:14 +08:00 |
|
|
|
a92d70179e
|
Merge branch 'feat-cjy-customerContract' into dev
|
2026-02-03 10:46:04 +08:00 |
|
|
|
adbe0abb2a
|
fix:移除一些无用注释
|
2026-02-03 10:45:53 +08:00 |
|
|
|
aa772f6590
|
解决冲突
|
2026-02-03 10:19:01 +08:00 |
|
|
|
fa43fadae2
|
添加竞品数
|
2026-02-03 10:18:40 +08:00 |
|
|
|
eee821c4cb
|
11
|
2026-02-03 10:01:36 +08:00 |
|
jiaji.H
|
14d0465e6d
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 09:26:41 +08:00 |
|
jiaji.H
|
420a169c65
|
Updata：完善检索逻辑
|
2026-02-03 09:26:26 +08:00 |
|
jiaji.H
|
83d682b8af
|
Updata:解决冲突
|
2026-02-02 20:44:52 +08:00 |
|
jiaji.H
|
dfd82b87b8
|
Updata：更新log
|
2026-02-02 20:43:49 +08:00 |
|
jiaji.H
|
34fbe7a3d9
|
Updata：增加log
|
2026-02-02 20:30:33 +08:00 |
|
jiaji.H
|
e53e2963a6
|
Updata：增加数据打印
|
2026-02-02 20:30:03 +08:00 |
|
jiaji.H
|
3bfd1007ee
|
Updata：解决冲突
|
2026-02-02 20:02:35 +08:00 |
|
jiaji.H
|
c348409a73
|
Updata：更新数据创建
|
2026-02-02 20:00:28 +08:00 |
|
jiaji.H
|
171d6b04d3
|
Updata：解决冲突
|
2026-02-02 19:46:18 +08:00 |
|
jiaji.H
|
1f8fb4abf8
|
Updata：增加打印
|
2026-02-02 19:45:51 +08:00 |
|
jiaji.H
|
ae95c7dd4a
|
Updata：增加字段
|
2026-02-02 19:40:10 +08:00 |
|
jiaji.H
|
88309279aa
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-02 18:01:51 +08:00 |
|
jiaji.H
|
7276a7d24e
|
Updata：修改发票相关信息查询
|
2026-02-02 18:01:43 +08:00 |
|
|
|
57bfb779bd
|
Merge branch 'jng' into dev
|
2026-02-02 17:54:30 +08:00 |
|
|
|
48e5d51373
|
Update bundleExtend.go
|
2026-02-02 17:54:24 +08:00 |
|
|
|
83a309152e
|
Merge branch 'jng' into dev
|
2026-02-02 17:32:07 +08:00 |
|
|
|
0c8631e775
|
Update bundleExtend.go
|
2026-02-02 17:32:01 +08:00 |
|
|
|
8bea38c983
|
Merge branch 'jng' into dev
|
2026-02-02 16:55:51 +08:00 |
|
|
|
bbc0b97b30
|
Update bundleExtend.go
|
2026-02-02 16:55:45 +08:00 |
|
jiaji.H
|
5d9592b3e3
|
Updata：解决冲突
|
2026-02-02 16:45:45 +08:00 |
|
jiaji.H
|
01cb67feda
|
Updata：更新字段
|
2026-02-02 16:36:59 +08:00 |
|
jiaji.H
|
66bffabfa0
|
Updata：解决冲突
|
2026-02-02 15:39:21 +08:00 |
|
jiaji.H
|
2b23495bce
|
Updata：更新脚本导出字段
|
2026-02-02 15:38:45 +08:00 |
|
jiaji.H
|
1ffdb284ec
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-02 15:24:56 +08:00 |
|
jiaji.H
|
574fa6e3e6
|
Updata：增加区号
|
2026-02-02 15:24:32 +08:00 |
|
jiaji.H
|
01e488555f
|
Updata：增加区号字段
|
2026-02-02 15:22:21 +08:00 |
|
jiaji.H
|
111adcbcd9
|
Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/micro-bundle into dev
|
2026-02-02 14:13:16 +08:00 |
|
jiaji.H
|
a46add94a4
|
Updata：解决冲突
|
2026-02-02 14:13:11 +08:00 |
|
|
|
aef6696a70
|
Merge branch 'feat-cjy-customerContract' into dev
|
2026-02-02 14:09:35 +08:00 |
|
jiaji.H
|
2cf1b946d0
|
Updata:更新字段
|
2026-02-02 14:09:27 +08:00 |
|
|
|
99d05a503a
|
fix：最近更新时间精度精确到分钟
|
2026-02-02 14:09:24 +08:00 |
|
jiaji.H
|
6b1f03a42a
|
Updata：解决冲突
|
2026-02-02 13:42:44 +08:00 |
|
jiaji.H
|
8db49c0db9
|
Updata：增加字段
|
2026-02-02 13:39:09 +08:00 |
|
|
|
bf8bd3b9eb
|
Merge branch 'feat-cjy-customerContract' into dev
|
2026-02-02 11:44:45 +08:00 |
|
|
|
c7ee97adcb
|
fix：过滤掉周期为 -1的周期
|
2026-02-02 11:44:37 +08:00 |
|
|
|
c3a721d343
|
Merge branch 'feat-cjy-customerContract' into dev
|
2026-02-02 11:29:18 +08:00 |
|
|
|
2db9a511ed
|
fix：子表的支付周期和开发周期只少有一期
|
2026-02-02 11:28:58 +08:00 |
|
jiaji.H
|
1a8d5b1bd4
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-02 11:25:48 +08:00 |
|
jiaji.H
|
28add54ce9
|
Updata：增加状态更新
|
2026-02-02 11:25:38 +08:00 |
|
jiaji.H
|
6b7df996a3
|
Updata：解决冲突
|
2026-02-02 11:21:23 +08:00 |
|
jiaji.H
|
1389a4ad94
|
Updata：修改数据结构
|
2026-02-02 11:14:50 +08:00 |
|
jiaji.H
|
0a273e7e32
|
Updata：增加H5获取用户发票列表
|
2026-02-02 10:56:54 +08:00 |
|
|
|
6500d35013
|
Merge branch 'feat-cjy-customerContract' into dev
|
2026-02-02 10:44:15 +08:00 |
|
|
|
13b077c172
|
fix:修复重复创建的问题
|
2026-02-02 10:44:07 +08:00 |
|
|
|
0ae0e32db9
|
Merge branch 'feat-cjy-customerContract' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-02-02 10:22:10 +08:00 |
|
|
|
dcfe12ba09
|
Merge branch 'fix-cjy-main' into dev
# Conflicts:
# pb/bundle.proto
# pb/bundle/bundle.pb.go
# pb/bundle/bundle.validator.pb.go
# pb/bundle/bundle_triple.pb.go
|
2026-02-02 10:21:31 +08:00 |
|
|
|
9750b0b505
|
feat:附件增加一个文件名称
|
2026-02-02 10:09:02 +08:00 |
|
|
|
874dc6b720
|
Merge branch 'jng' into dev
|
2026-02-02 09:58:46 +08:00 |
|
|
|
e7fff341ca
|
Update orderRecordsDao.go
|
2026-02-02 09:58:39 +08:00 |
|
jiaji.H
|
80555657dc
|
Updata：修正精度丢失
|
2026-01-31 00:03:55 +08:00 |
|
jiaji.H
|
a9e1730402
|
Upload：更新统计
|
2026-01-30 23:14:37 +08:00 |
|
jiaji.H
|
9760aab1bb
|
Updata更新sql
|
2026-01-30 22:35:30 +08:00 |
|
jiaji.H
|
1bddcbef56
|
Updata：修正查询sql
|
2026-01-30 21:35:35 +08:00 |
|
|
|
4858d474d5
|
Merge branch 'feat-cjy-customerContract' into dev
|
2026-01-30 17:58:24 +08:00 |
|
|
|
25f323ef66
|
fix: 增加字数校验
|
2026-01-30 17:58:13 +08:00 |
|
|
|
6f429cf9c6
|
Merge branch 'feat-cjy-customerContract' into dev
|
2026-01-30 16:42:49 +08:00 |
|
|
|
2f893c8fd4
|
feat：增加校验
|
2026-01-30 16:42:40 +08:00 |
|
|
|
7581a337a7
|
解决冲突
|
2026-01-30 15:42:37 +08:00 |
|
|
|
0c930af71a
|
添加接口
|
2026-01-30 15:41:55 +08:00 |
|
|
|
d74cc74369
|
Merge branch 'feat-cjy-customerContract' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-01-30 15:31:53 +08:00 |
|
|
|
c57b60230b
|
feat: 增加推荐人列表
|
2026-01-30 15:30:57 +08:00 |
|
jiaji.H
|
6ac8b2b1b4
|
Updata:解决冲突
|
2026-01-30 15:18:47 +08:00 |
|
|
|
295d26a35a
|
fix：修复子表没有uuid的问题
|
2026-01-30 15:17:38 +08:00 |
|
|
|
84dacc72ce
|
添加购买类型字段
|
2026-01-30 14:26:28 +08:00 |
|
jiaji.H
|
63ccfb5c90
|
Updata:解决冲突
|
2026-01-30 12:42:08 +08:00 |
|
|
|
321d7483a5
|
Merge branch 'feat-cjy-customerContract' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-01-30 11:43:31 +08:00 |
|
jiaji.H
|
ca02baa840
|
Updata:增加导出发布作品数据临时接口
|
2026-01-30 11:39:18 +08:00 |
|
|
|
b5d7e7181b
|
fix：修复格式错误
|
2026-01-30 11:39:17 +08:00 |
|
|
|
b8edca7df5
|
fix： 创建时，不需要提供客户id
|
2026-01-30 11:31:47 +08:00 |
|
jiaji.H
|
d01f325ed4
|
Updata：增加接口数据字段
|
2026-01-30 11:16:21 +08:00 |
|
|
|
83b4e13457
|
feat：增加校验
|
2026-01-30 10:42:52 +08:00 |
|
