Commit Graph

2582 Commits

Author SHA1 Message Date
cjy
c399689be0 fix: 避免空指针 2026-02-09 12:37:44 +08:00
cjy
cea0b741f8 fix:修改判断查询失败的逻辑 2026-02-09 12:37:26 +08:00
cjy
c941a46cee fix:续费的话,查询续费开始到现在套餐的时间所有数据
# Conflicts:
#	api/bundle/bundle.pb.go
#	api/cast/cast.pb.go
#	pkg/service/cast/analysis.go
#	pkg/service/cast/report.go
2026-02-09 12:36:51 +08:00
cjy
31a08879b6 fix:如果套餐为续费套餐直接失败
# Conflicts:
#	api/cast/cast.pb.go
2026-02-09 11:58:14 +08:00
cjy
8ec97fdcff fix:创建竞品报告时,传入订单uuid 2026-02-09 11:55:17 +08:00
cjy
063a7991ba Merge branch 'fix-cjy-baseOnjng'
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
2026-02-09 11:53:30 +08:00
cjy
59ece0cb7f Merge branch 'feat-cjy-changeOperator'
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
#	pkg/cron/task.go
2026-02-09 11:52:07 +08:00
jiaji.H
4530e68c11 Updata:解决冲突 2026-02-09 11:46:18 +08:00
jiaji.H
f751d84943 Updata:解决冲突 2026-02-09 11:33:38 +08:00
JNG
0a1678da58 11 2026-02-09 11:33:14 +08:00
JNG
e1a75ee420 解决冲突 2026-02-09 11:31:22 +08:00
195ac2a769 fiee5️⃣期需求
账号过期解绑
2026-02-09 11:30:22 +08:00
7dc1dca799 修改审批时间 2026-02-09 11:11:59 +08:00
28d7fea3c7 修改审批时间 2026-02-09 11:11:06 +08:00
bx1834938347-prog
8eb22deb18 Merge branch 'wwq' 2026-02-09 09:41:51 +08:00
4fd1f7c08a Merge branch 'fix-import-script-daiyb' into dev 2026-02-06 19:42:46 +08:00
5e10fe8bb0 优化脚本导入自己不能同时导入2个 2026-02-06 19:42:39 +08:00
cjy
b58e02a5ae fix: 避免空指针 2026-02-06 19:24:20 +08:00
cjy
9c6029c20b fix:修改时间戳格式化 2026-02-06 18:36:12 +08:00
ee64ecd246 Merge branch 'feature-special-daiyb' into dev 2026-02-06 18:21:38 +08:00
23cf5af6dc 修改上下文解析 2026-02-06 18:21:33 +08:00
920098c6c3 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-02-06 17:24:26 +08:00
ec009e2eb1 Merge branch 'feature-special-daiyb' into dev 2026-02-06 17:24:24 +08:00
e74bf2f911 修改种子 2026-02-06 17:24:18 +08:00
cjy
ce0fb99ed6 fix:修改判断查询失败的逻辑 2026-02-06 17:12:05 +08:00
cjy
0142be0dc6 fix:续费的话,查询续费开始到现在套餐的时间所有数据 2026-02-06 17:00:38 +08:00
e671b6817c Merge branch 'feature-special-daiyb' into dev 2026-02-06 16:41:19 +08:00
4df6706dac 兼容无token调用 2026-02-06 16:41:13 +08:00
268591b457 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-02-06 16:15:11 +08:00
f33c28f473 Merge branch 'feature-special-daiyb' into dev 2026-02-06 16:15:11 +08:00
c798ed545a 特殊补发 2026-02-06 16:15:04 +08:00
JNG
35553819be Merge branch 'jng' into dev 2026-02-06 15:33:03 +08:00
JNG
83b4e9dd9c 处理0元购 2026-02-06 15:32:57 +08:00
b0cde4651a Merge branch 'feature-four-daiyb' into dev 2026-02-06 14:56:39 +08:00
32af1ae5c1 Update media.go 2026-02-06 14:56:32 +08:00
179b3c2838 Merge branch 'feature-four-daiyb' into dev 2026-02-06 14:34:58 +08:00
a805c9c382 Update test.go 2026-02-06 14:34:53 +08:00
b1bb087316 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-02-06 14:33:27 +08:00
76d64508bb Merge branch 'feature-four-daiyb' into dev 2026-02-06 14:33:21 +08:00
ccb469edda Update test.go 2026-02-06 14:33:14 +08:00
cjy
f9f02e7b10 增加一点日志 2026-02-06 14:31:22 +08:00
1d36eea47c 修改订单刷新 2026-02-06 14:11:14 +08:00
06d6eae188 创建订单的时候调用订单刷新功能 2026-02-06 14:10:21 +08:00
0cef4a573e Update test.go 2026-02-06 13:39:18 +08:00
4773caf295 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-02-06 12:03:22 +08:00
54f4b5d62e Merge branch 'feature-four-daiyb' into dev 2026-02-06 12:03:21 +08:00
62e25d3079 修改同步逻辑 2026-02-06 12:03:14 +08:00
JNG
015ed265e6 Merge branch 'jng-contract-0205' into dev 2026-02-06 11:37:12 +08:00
JNG
93502cb589 Update signContractV2.go 2026-02-06 11:37:03 +08:00
JNG
8c2299ff38 Merge branch 'jng-contract-0205' into dev 2026-02-06 11:10:40 +08:00
JNG
68de4b6c54 修改订单签署 2026-02-06 11:10:30 +08:00
cjy
60beab01be fix:如果套餐为续费套餐直接失败 2026-02-05 20:24:55 +08:00
cjy
46b7762471 fix:创建竞品报告时,传入订单uuid 2026-02-05 20:24:37 +08:00
cjy
bb326bfe0d fix:更新也增加订单uuid 2026-02-05 20:24:00 +08:00
cjy
0bdf0f9648 feat:存入订单uuid
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
2026-02-05 20:22:11 +08:00
cjy
4c4d139b05 fix:更新也增加订单uuid 2026-02-05 19:32:00 +08:00
6690717e77 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-02-05 18:04:39 +08:00
762fdd4b05 修改续费逻辑 2026-02-05 18:04:39 +08:00
6bc617ecc3 修改续费逻辑 2026-02-05 18:03:18 +08:00
cjy
d27b85a155 feat:存入订单uuid 2026-02-05 17:52:24 +08:00
JNG
4e4ab14d5a Merge branch 'jng-contract-0205' into dev 2026-02-05 17:29:05 +08:00
JNG
41f1a807a9 Update signContractV2.go 2026-02-05 17:28:52 +08:00
81c28c0bd4 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-02-05 17:07:52 +08:00
cf2e4067b9 脚本更新 2026-02-05 17:07:51 +08:00
cf709742b2 脚本更新 2026-02-05 17:06:24 +08:00
jiaji.H
47699dec97 Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev 2026-02-05 16:20:06 +08:00
jiaji.H
16d6d4bd29 Updata:注释0元生成发票 2026-02-05 16:19:51 +08:00
38117c3a08 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-02-05 15:50:04 +08:00
fee7728da9 Merge branch 'feature-four-daiyb' into dev 2026-02-05 15:50:00 +08:00
e0a5346302 完善代码 2026-02-05 15:49:55 +08:00
jiaji.H
ee190b4a96 Merge branch 'jng' into dev 2026-02-05 15:48:54 +08:00
jiaji.H
63e3991f23 Updata:更新文件确认 2026-02-05 15:48:31 +08:00
fbe32fb485 套餐已过期 2026-02-05 15:44:55 +08:00
433ec99628 套餐已过期 2026-02-05 15:44:19 +08:00
9ba37adb6b Merge branch 'feature-four-daiyb' into dev 2026-02-05 14:39:30 +08:00
164b683b7d Update task.go 2026-02-05 14:39:22 +08:00
b1bde71f34 Update task.go 2026-02-05 14:38:45 +08:00
cjy
2aa0a73041 fix:暂时注释 2026-02-05 13:15:02 +08:00
cjy
084df09c9b Merge branch 'feat-cjy-changeOperator' into dev
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
2026-02-05 13:10:00 +08:00
cjy
1d2ba64a22 fix:视频脚本为任务4 2026-02-05 11:36:33 +08:00
cjy
be1b0d24ec fix:视频脚本为任务4 2026-02-05 11:36:08 +08:00
cjy
51f0d2b687 fix:视频脚本为任务4 2026-02-05 11:35:50 +08:00
cjy
748ceb5d63 feat: 增加审批通过时间 2026-02-05 11:28:01 +08:00
cjy
d92d4199c7 fix:修改刷新定时任务的频率,并修改pageSize数量 2026-02-05 09:57:14 +08:00
cjy
c82f137ac1 fix:调用列表不再刷新审批更新状态 2026-02-05 09:56:20 +08:00
cjy
15338ca7c8 fix:更新通过审批的操作人为业务部门 2026-02-05 09:52:32 +08:00
5d27d502c8 取消授权写入excel 2026-02-04 19:15:36 +08:00
f4c826936b 解绑取消授权记录 2026-02-04 19:02:42 +08:00
f59b434dc7 同步bundle的proto 2026-02-04 17:39:00 +08:00
jiaji.H
529e5e3f3c Updata:更新log 2026-02-04 16:48:07 +08:00
jiaji.H
20af43c9e2 Updata:增加调试log 2026-02-04 16:47:15 +08:00
jiaji.H
41880fd840 Updata:解决冲突 2026-02-04 16:41:31 +08:00
jiaji.H
e6af927159 Updata:更新判别是否为新套餐还是续费套餐 2026-02-04 16:39:36 +08:00
3940e5f9eb Merge branch 'feature-four-daiyb' into dev 2026-02-04 16:09:14 +08:00
39dc62b032 套餐续费和新购 2026-02-04 16:09:08 +08:00
jiaji.H
5ded15fbb0 Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev 2026-02-04 14:11:29 +08:00
jiaji.H
c5e36a2ae9 Updata:更新字段 2026-02-04 14:11:21 +08:00
jiaji.H
0a7e169a7e Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev 2026-02-04 14:09:28 +08:00
jiaji.H
94a1c30acd Updata:更新时间获取 2026-02-04 14:09:18 +08:00
jiaji.H
566773b0f6 Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev 2026-02-04 14:00:07 +08:00
jiaji.H
e1271f7caf Updata:更新时间获取 2026-02-04 13:59:57 +08:00
e767e47277 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-02-04 13:48:57 +08:00
7cca30c2a5 Merge branch 'fix-operator-daiyb' into dev 2026-02-04 13:48:53 +08:00
d3ae7e0b85 修改默认值 2026-02-04 13:48:46 +08:00
jiaji.H
38c1667614 Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev 2026-02-04 13:45:09 +08:00
jiaji.H
bdecb8a05f Updata:更新数据 2026-02-04 13:45:01 +08:00
jiaji.H
531fddc629 Updata:解决冲突 2026-02-04 13:23:24 +08:00
jiaji.H
4a2263fba9 Updata:更新发票订单信息查询 2026-02-04 13:21:24 +08:00
jiaji.H
13ea22fae8 Updata:修改获取时间逻辑 2026-02-04 13:11:33 +08:00
f0253f9805 Merge branch 'feat-zjy-fixbug-033' into dev 2026-02-04 13:09:13 +08:00
48aa714706 fix: 调整创建订单的uuid 2026-02-04 13:08:30 +08:00
c85fbb0b81 fix: 调整创建订单的uuid 2026-02-04 12:24:23 +08:00
bf09640ff0 Merge branch 'feat-zjy-fixbug-033' into dev
# Conflicts:
#	api/bundle/bundle.pb.go
#	api/bundle/bundle.validator.pb.go
#	api/bundle/bundle_triple.pb.go
#	pkg/service/bundle/pay.go
2026-02-04 12:20:18 +08:00
54b15344e0 fix: 调整创建订单的uuid 2026-02-04 12:13:27 +08:00
jiaji.H
3e454b4348 Updata:增加log 2026-02-04 11:46:32 +08:00
1344e1da8b fix: 222 2026-02-04 11:36:32 +08:00
jiaji.H
6f86e07650 Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev 2026-02-04 10:43:46 +08:00
jiaji.H
b4e95bc134 Updata:增加时间格式化接口 2026-02-04 10:43:36 +08:00
jiaji.H
62c8cb0fa1 Updata:解决冲突 2026-02-04 10:27:09 +08:00
jiaji.H
b047ed5056 Updata:增加log 2026-02-04 10:25:33 +08:00
jiaji.H
717ae05cc8 Updata:替换获取发票编号接口 2026-02-04 10:23:33 +08:00
573ad1b147 fix: antomReq.OutTradeNo = uuidV4.String() 2026-02-04 10:21:41 +08:00
a947556202 fix: antomReq.OutTradeNo = uuidV4.String() 2026-02-04 10:11:20 +08:00
cjy
5a89ad139f Merge branch 'feat-cjy-customerContract'
# Conflicts:
#	api/bundle/bundle.pb.go
#	api/bundle/bundle.validator.pb.go
#	api/bundle/bundle_triple.pb.go
2026-02-04 09:42:19 +08:00
5a814ab12f DM取消授权 2026-02-04 09:41:39 +08:00
JNG
8197ac4b57 Merge branch 'jng' into dev 2026-02-03 19:41:57 +08:00
JNG
a0ad992ab1 Update bundleOrder.go 2026-02-03 19:41:43 +08:00
jiaji.H
5eb27a0b49 Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev 2026-02-03 17:33:35 +08:00
jiaji.H
25905062f6 Updata:生成发票时间修改 2026-02-03 17:33:14 +08:00
JNG
62fa35b029 解决冲突 2026-02-03 16:49:17 +08:00
JNG
0802c372b0 修改 2026-02-03 16:46:57 +08:00
jiaji.H
b0c725a68b Merge branch 'feat-hjj-ExportBat' 2026-02-03 16:26:49 +08:00
JNG
bb9c22e1aa Merge branch 'feature-four-daiyb' into jng 2026-02-03 16:24:16 +08:00
jiaji.H
368078c543 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-02-03 16:21:35 +08:00
jiaji.H
982558afe3 Updata:更新判断 2026-02-03 16:21:30 +08:00
103fe91e8f Merge branch 'feature-four-daiyb' into dev 2026-02-03 16:21:25 +08:00
bbb09a08b2 修改接口 2026-02-03 16:21:13 +08:00
jiaji.H
e9d67c5cdc Updata:更新判断 2026-02-03 16:20:48 +08:00
jiaji.H
a9201e794c Updata:解决冲突 2026-02-03 16:19:27 +08:00
jiaji.H
0cb451338c Updata:解决冲突 2026-02-03 16:14:57 +08:00
jiaji.H
6110dce131 Updata:解决冲突 2026-02-03 16:06:54 +08:00
jiaji.H
267b0d6ab8 Updata:更新字段格式 2026-02-03 16:06:11 +08:00
jiaji.H
34810300da Updata:更新字段格式 2026-02-03 16:04:53 +08:00
7e77b6d585 发布来源 2026-02-03 15:29:36 +08:00
jiaji.H
9704208f9d Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev 2026-02-03 15:09:02 +08:00
jiaji.H
b385b83824 Updata:增加发票地址打印换行 2026-02-03 15:08:52 +08:00
jiaji.H
63e57f1140 Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev 2026-02-03 14:50:46 +08:00
jiaji.H
59f45258eb Updata:增加间隔 2026-02-03 14:50:39 +08:00
jiaji.H
802510ed45 Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev 2026-02-03 14:24:11 +08:00
jiaji.H
81346d611a Updata:更新发票 2026-02-03 14:24:00 +08:00
jiaji.H
cba570d832 Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev 2026-02-03 14:15:35 +08:00
jiaji.H
6031afe227 Updata:更新金额类型 2026-02-03 14:15:27 +08:00
jiaji.H
d56ed7577b Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev 2026-02-03 13:42:02 +08:00
jiaji.H
c16c41f65c Updata:更新申请时间 2026-02-03 13:41:51 +08:00
jiaji.H
48a4539f4b Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev 2026-02-03 13:29:56 +08:00
jiaji.H
1431646900 Updata:更新发票导出 2026-02-03 13:29:50 +08:00
jiaji.H
638ff85367 Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev 2026-02-03 11:49:40 +08:00
jiaji.H
350259c208 Updata:更新发票模板 2026-02-03 11:49:31 +08:00
jiaji.H
652e23e1e9 Merge branch 'feat-hjj-ExportBat' 2026-02-03 11:20:07 +08:00
jiaji.H
33d9193f1d Updata:更新精度处理 2026-02-03 11:19:59 +08:00
jiaji.H
3d40d77080 Merge branch 'feat-hjj-ExportBat' 2026-02-03 10:50:21 +08:00
jiaji.H
24c73d39a5 Updata:更新数据导出精度 2026-02-03 10:50:12 +08:00
JNG
1096dde762 Merge branch 'feature-four-daiyb' into jng 2026-02-03 10:23:22 +08:00
JNG
71420b3c1c 11 2026-02-03 10:19:33 +08:00
afc0007984 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-02-03 09:45:51 +08:00
f39ca2179d Merge branch 'feature-four-daiyb' into dev 2026-02-03 09:45:50 +08:00
544a8be9dc 解绑账号 2026-02-03 09:45:44 +08:00
jiaji.H
e3075e48b9 Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev 2026-02-03 09:31:49 +08:00
jiaji.H
a1d75feb94 Updata:更新数据写入 2026-02-03 09:31:39 +08:00
jiaji.H
e4c21ef020 Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev 2026-02-02 20:26:18 +08:00
jiaji.H
8941f59432 Updata:增加发票数据导出 2026-02-02 20:26:10 +08:00
jiaji.H
3d7b70840a Updata:解决冲突 2026-02-02 20:03:11 +08:00
jiaji.H
1a069a7136 Updata:更新pb文件 2026-02-02 20:01:50 +08:00
jiaji.H
1b06517403 Updata:更新pb文件 2026-02-02 19:47:46 +08:00
jiaji.H
7df053aa39 Updata:增加注释 2026-02-02 19:47:20 +08:00
jiaji.H
3cd8deb84b Updata:自动创建电子发票 2026-02-02 19:43:42 +08:00
jiaji.H
b47b872ab4 Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev 2026-02-02 19:17:11 +08:00
jiaji.H
fa67b49c53 Updata:更新上传逻辑 2026-02-02 19:17:03 +08:00
jiaji.H
faf4a85e2e Updata:修改上传bos方法 2026-02-02 19:15:15 +08:00
jiaji.H
1ead1952a1 Updata:解决冲突 2026-02-02 18:14:36 +08:00
jiaji.H
3c0ddfe06b Updata:更新发票生成 2026-02-02 18:14:00 +08:00
jiaji.H
ac776576f2 Updata:增加log 2026-02-02 17:53:51 +08:00
jiaji.H
3a156b08f0 增加测试代码 2026-02-02 17:39:01 +08:00
jiaji.H
bcbddbec6f Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-02-02 17:11:50 +08:00
jiaji.H
a8e79d0877 Updata:去除返回 2026-02-02 17:11:44 +08:00
f4f75a06ca Merge branch 'feature-four-daiyb' 2026-02-02 16:50:59 +08:00
579fcb3667 Merge branch 'feature-four-daiyb' into dev 2026-02-02 16:50:51 +08:00
076d4d3f80 Update test.go 2026-02-02 16:50:46 +08:00
c9543cfad2 Merge branch 'feature-four-daiyb' 2026-02-02 16:46:35 +08:00
e5dedcaf91 Merge branch 'feature-four-daiyb' into dev 2026-02-02 16:46:26 +08:00
3313cb56b4 修改每个月1号等待一下1点后执行 2026-02-02 16:46:20 +08:00
jiaji.H
dbb8cd4615 Merge branch 'main' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee 2026-02-02 16:39:54 +08:00
jiaji.H
e85de27321 Updata:更新pb文件 2026-02-02 16:39:49 +08:00
b62d412022 Merge branch 'main' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee 2026-02-02 16:13:42 +08:00
7373026f48 Merge branch 'feature-four-daiyb' 2026-02-02 16:13:01 +08:00
jiaji.H
c9e7850b8a Merge branch 'feat-hjj-ExportBat' 2026-02-02 16:04:11 +08:00
jiaji.H
29948203d6 Updata:更新导出模板 2026-02-02 16:04:01 +08:00
jiaji.H
101dc38ed8 Updata:解决冲突 2026-02-02 15:48:09 +08:00
jiaji.H
7dee667a97 Updata:增加导出数据验收类型 2026-02-02 15:42:16 +08:00
jiaji.H
a5dcdf2a75 Updata:更新pb文件 2026-02-02 15:29:00 +08:00