|
|
24fe5e3760
|
Merge branch 'sxy'
|
2025-06-26 17:46:33 +08:00 |
|
|
|
7735b710dd
|
Merge branch 'dev-lzh'
|
2025-06-26 17:18:46 +08:00 |
|
|
|
bbf093e104
|
Merge branch 'feat-zjy-issue-008' into main
# Conflicts:
# api/bundle/bundle.pb.go
# api/bundle/bundle_triple.pb.go
# docs/dev/dubbogo.yaml
# pkg/router/bundle.go
# pkg/service/init.go
|
2025-06-26 17:07:16 +08:00 |
|
|
|
2fc8ee5cb2
|
合并代码
|
2025-06-26 16:54:59 +08:00 |
|
|
|
ab135ed80e
|
修复作品确认接口的提前返回问题
|
2025-06-25 16:52:11 +08:00 |
|
|
|
beb0ab72ab
|
确认列表过滤
|
2025-06-23 16:17:10 +08:00 |
|
|
|
382a32bec4
|
fix: 处理金额比较问题
|
2025-06-23 15:53:04 +08:00 |
|
|
|
cf413538fa
|
fix: 处理bug
|
2025-06-20 11:48:20 +08:00 |
|
|
|
c20c6871c9
|
fix: 处理冲突，增加自行购买
|
2025-06-20 11:26:16 +08:00 |
|
|
|
383f8bef10
|
Merge branch 'jng' into feat-zjy-issue-008
# Conflicts:
# api/bundle/bundle.pb.go
# api/bundle/bundle_triple.pb.go
|
2025-06-20 11:21:22 +08:00 |
|
|
|
acf472f1ef
|
fix: 注掉没用信息，太强说会更新两次
|
2025-06-20 11:02:48 +08:00 |
|
|
|
7c6edab53d
|
fix: 去掉单独购买增值服务的0远金额限制
|
2025-06-20 10:23:32 +08:00 |
|
|
|
320e110f8c
|
补充缺失字段
|
2025-06-20 09:44:03 +08:00 |
|
|
|
736e3b1bd0
|
修改H5套餐列表
|
2025-06-19 16:19:37 +08:00 |
|
|
|
8cfcbf345e
|
修改
|
2025-06-19 15:32:54 +08:00 |
|
|
|
a6e83c162d
|
添加扩展类型字段
|
2025-06-19 15:13:36 +08:00 |
|
|
|
c0be49a610
|
添加扩展类型字段
|
2025-06-19 15:13:15 +08:00 |
|
|
|
6eb8e2cef8
|
fix: 处理订单金额是0的情况,直接返回
|
2025-06-19 13:57:12 +08:00 |
|
|
|
a9474f1a3d
|
修改
|
2025-06-19 10:32:44 +08:00 |
|
|
|
bf28865012
|
fix: 处理订单金额是0的情况
|
2025-06-19 09:51:44 +08:00 |
|
|
|
62a0a2c0af
|
fix: 打日志
|
2025-06-18 16:27:17 +08:00 |
|
|
|
039cd019e9
|
修改套餐中间表
|
2025-06-18 15:51:31 +08:00 |
|
|
|
28cd572cbd
|
修改
|
2025-06-17 15:39:47 +08:00 |
|
|
|
5ad6d318e0
|
添加确认变更的接口
|
2025-06-17 14:27:43 +08:00 |
|
|
|
7bc66c7107
|
fix: 处理支付更新对账单id错误问题
|
2025-06-16 13:57:30 +08:00 |
|
|
|
21f6837fec
|
修改
|
2025-06-16 11:19:42 +08:00 |
|
|
|
6c194a0646
|
作品类型判断
|
2025-06-16 10:20:18 +08:00 |
|
|
|
638f2a9554
|
fix: 调整代码，创建支付的时候加入创建对账单。支付成功通知时更新对账单
|
2025-06-16 09:56:09 +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 |
|
|
|
057565b0aa
|
fix: 新增接口，根据orderNo,仅查询它单独购买的增值服务，调整支付创建时候仅增值的情况
|
2025-06-15 19:19:10 +08:00 |
|
|
|
32cf742fa8
|
fix: detail接口增加addBundle的字段
|
2025-06-15 18:29:10 +08:00 |
|
|
|
8000f56c06
|
修改
|
2025-06-15 15:27:51 +08:00 |
|
|
|
d47c033d7b
|
作品状态确认
|
2025-06-15 15:12:42 +08:00 |
|
|
|
3e16c413e5
|
作品状态判断
|
2025-06-15 15:00:45 +08:00 |
|
|
|
cb84e6195d
|
1
|
2025-06-15 14:58:29 +08:00 |
|
|
|
bfef9134b7
|
余量查询修改
|
2025-06-15 13:58:07 +08:00 |
|
|
|
e26c9f0c51
|
fix: 调整创建支付的代码逻辑
|
2025-06-15 13:23:11 +08:00 |
|
|
|
d3b16ace79
|
作品确认、用户余量信息
|
2025-06-15 12:18:50 +08:00 |
|
|
|
eb3e1f809b
|
修改
|
2025-06-15 10:06:57 +08:00 |
|
|
|
9402bad9fd
|
修改语言传输
|
2025-06-14 17:40:06 +08:00 |
|
|
|
f2277fa337
|
添加待确认作品详情查看
|
2025-06-14 17:13:30 +08:00 |
|
|
|
637fc47188
|
z增加详情接口
|
2025-06-14 17:10:28 +08:00 |
|
|
|
1bab9a17e6
|
修改proto
|
2025-06-14 17:09:14 +08:00 |
|
|
|
ba65fbe5b7
|
修改
|
2025-06-14 16:41:21 +08:00 |
|
|
|
c4e72efcb5
|
11
|
2025-06-14 15:23:14 +08:00 |
|
|
|
ae7b87aa17
|
添加作品记录和详情接口
|
2025-06-14 13:52:51 +08:00 |
|
|
|
a41962ba8d
|
添加使用记录接口
|
2025-06-14 13:29:05 +08:00 |
|
|
|
bb36d88c98
|
补齐依赖
|
2025-06-14 13:21:02 +08:00 |
|
|
|
0d28141f65
|
Merge remote-tracking branch 'origin/jng' into dev-lzh
|
2025-06-14 13:20:21 +08:00 |
|
