|
|
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 |
|
|
|
4d56bab91d
|
fix:日志添加竞品报告和视频脚本
|
2026-02-05 15:37:39 +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
|
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 |
|
