|
|
60498f8af9
|
解决冲突
|
2025-06-19 15:34:17 +08:00 |
|
|
|
8cfcbf345e
|
修改
|
2025-06-19 15:32:54 +08:00 |
|
|
|
cf95f2b9fe
|
Merge branch 'dev-lzh' into dev
|
2025-06-19 15:13:41 +08:00 |
|
|
|
a6e83c162d
|
添加扩展类型字段
|
2025-06-19 15:13:36 +08:00 |
|
|
|
c0be49a610
|
添加扩展类型字段
|
2025-06-19 15:13:15 +08:00 |
|
|
|
d1191753f3
|
Merge branch 'feat-zjy-issue-008' into dev
|
2025-06-19 13:57:52 +08:00 |
|
|
|
6eb8e2cef8
|
fix: 处理订单金额是0的情况,直接返回
|
2025-06-19 13:57:12 +08:00 |
|
|
|
bacedd206f
|
Merge branch 'jng' into dev
|
2025-06-19 10:34:02 +08:00 |
|
|
|
a9474f1a3d
|
修改
|
2025-06-19 10:32:44 +08:00 |
|
|
|
789c1dc81c
|
Merge branch 'feat-zjy-issue-008' into dev
|
2025-06-19 09:52:32 +08:00 |
|
|
|
bf28865012
|
fix: 处理订单金额是0的情况
|
2025-06-19 09:51:44 +08:00 |
|
|
|
492fdfeee2
|
Merge branch 'feat-zjy-issue-008' into dev
|
2025-06-18 16:28:30 +08:00 |
|
|
|
62a0a2c0af
|
fix: 打日志
|
2025-06-18 16:27:17 +08:00 |
|
|
|
2b013f5269
|
Merge branch 'sxy' into dev
|
2025-06-18 15:51:52 +08:00 |
|
|
|
039cd019e9
|
修改套餐中间表
|
2025-06-18 15:51:31 +08:00 |
|
|
|
b2e9b0c2d1
|
Merge branch 'jng' into dev
|
2025-06-17 15:40:00 +08:00 |
|
|
|
28cd572cbd
|
修改
|
2025-06-17 15:39:47 +08:00 |
|
|
|
cb707c96e1
|
Merge branch 'dev-lzh' into dev
|
2025-06-17 14:28:29 +08:00 |
|
|
|
5ad6d318e0
|
添加确认变更的接口
|
2025-06-17 14:27:43 +08:00 |
|
|
|
cebf285f8e
|
Merge branch 'feat-zjy-issue-008' into dev
|
2025-06-16 13:57:49 +08:00 |
|
|
|
7bc66c7107
|
fix: 处理支付更新对账单id错误问题
|
2025-06-16 13:57:30 +08:00 |
|
|
|
a5d6e45cd1
|
Merge branch 'jng' into dev
|
2025-06-16 11:19:50 +08:00 |
|
|
|
21f6837fec
|
修改
|
2025-06-16 11:19:42 +08:00 |
|
|
|
033d9ba023
|
Merge branch 'dev-lzh' into dev
|
2025-06-16 10:20:24 +08:00 |
|
|
|
6c194a0646
|
作品类型判断
|
2025-06-16 10:20:18 +08:00 |
|
|
|
35712fdbe2
|
Merge branch 'feat-zjy-issue-008' into dev
# Conflicts:
# api/bundle/bundle.pb.go
# api/bundle/bundle_triple.pb.go
|
2025-06-16 10:03:06 +08:00 |
|
|
|
638f2a9554
|
fix: 调整代码，创建支付的时候加入创建对账单。支付成功通知时更新对账单
|
2025-06-16 09:56:09 +08:00 |
|
|
|
49137828da
|
Merge branch 'feat-zjy-issue-008' into dev
|
2025-06-15 20:57:25 +08:00 |
|
|
|
e370308b10
|
fix: 调整校验状态
|
2025-06-15 20:57:02 +08:00 |
|
|
|
cf18598b96
|
Merge branch 'jng' into feat-zjy-issue-008
# Conflicts:
# api/bundle/bundle.pb.go
|
2025-06-15 20:54:42 +08:00 |
|
|
|
ce95cface5
|
Merge branch 'feat-zjy-issue-008' into dev
# Conflicts:
# api/bundle/bundle.pb.go
# pkg/router/bundle.go
# pkg/service/bundle/bundleProfile.go
|
2025-06-15 19:22:14 +08:00 |
|
|
|
057565b0aa
|
fix: 新增接口，根据orderNo,仅查询它单独购买的增值服务，调整支付创建时候仅增值的情况
|
2025-06-15 19:19:10 +08:00 |
|
|
|
2276144fc4
|
Merge branch 'feat-zjy-issue-008' into dev
# Conflicts:
# api/bundle/bundle.pb.go
|
2025-06-15 18:31:52 +08:00 |
|
|
|
32cf742fa8
|
fix: detail接口增加addBundle的字段
|
2025-06-15 18:29:10 +08:00 |
|
|
|
729c9e661c
|
解决冲突
|
2025-06-15 15:32:25 +08:00 |
|
|
|
8000f56c06
|
修改
|
2025-06-15 15:27:51 +08:00 |
|
|
|
aa08c15e2a
|
Merge branch 'dev-lzh' into dev
|
2025-06-15 15:12:49 +08:00 |
|
|
|
d47c033d7b
|
作品状态确认
|
2025-06-15 15:12:42 +08:00 |
|
|
|
3e16c413e5
|
作品状态判断
|
2025-06-15 15:00:45 +08:00 |
|
|
|
c84fb621a9
|
作品状态判断
|
2025-06-15 15:00:14 +08:00 |
|
|
|
325d14d913
|
Merge branch 'dev-lzh' into dev
|
2025-06-15 14:58:36 +08:00 |
|
|
|
cb84e6195d
|
1
|
2025-06-15 14:58:29 +08:00 |
|
|
|
45a3751914
|
删除调试日志
|
2025-06-15 14:56:01 +08:00 |
|
|
|
1dd8ccf3b7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-15 14:55:25 +08:00 |
|
|
|
15ddf58f55
|
Merge branch 'feat-zjy-issue-008' into dev
# Conflicts:
# api/bundle/bundle.pb.go
# api/bundle/bundle_triple.pb.go
# docs/dev/dubbogo.yaml
# pkg/service/init.go
|
2025-06-15 14:53:47 +08:00 |
|
|
|
4b9e6eb7bd
|
调试日志打印
|
2025-06-15 14:51:51 +08:00 |
|
|
|
966790326e
|
Merge branch 'dev-lzh' into dev
|
2025-06-15 13:58:15 +08:00 |
|
|
|
bfef9134b7
|
余量查询修改
|
2025-06-15 13:58:07 +08:00 |
|
|
|
e26c9f0c51
|
fix: 调整创建支付的代码逻辑
|
2025-06-15 13:23:11 +08:00 |
|
|
|
26c0056b12
|
Merge branch 'dev-lzh' into dev
|
2025-06-15 12:22:38 +08:00 |
|
