|
|
df96102509
|
Merge branch 'sxy' into dev
|
2025-06-18 15:49:43 +08:00 |
|
|
|
6107e35aca
|
修改
|
2025-06-18 15:49:21 +08:00 |
|
|
|
412e679b94
|
Merge branch 'sxy' into dev
|
2025-06-18 11:42:56 +08:00 |
|
|
|
4c027c4a08
|
修改
|
2025-06-18 11:42:39 +08:00 |
|
|
|
fc396fd909
|
Merge branch 'dev-lzh' into dev
|
2025-06-17 16:09:46 +08:00 |
|
|
|
2a137ad3fb
|
修改查询条件
|
2025-06-17 16:09:38 +08:00 |
|
|
|
3fae4f4ab7
|
modified: internal/dao/bundleExtend.go
|
2025-06-17 14:39:39 +08:00 |
|
|
|
ebb08194d6
|
修改时间类型
|
2025-06-17 14:38:52 +08:00 |
|
|
|
19ac6f4bf3
|
Merge branch 'dev-lzh' into dev
|
2025-06-17 14:15:36 +08:00 |
|
|
|
32de65196b
|
添加确认状态
|
2025-06-17 14:14:09 +08:00 |
|
|
|
5e6f69bacf
|
Merge branch 'sxy' into dev
|
2025-06-17 09:26:29 +08:00 |
|
|
|
379cc1b1e7
|
增加clor-1
|
2025-06-17 09:26:09 +08:00 |
|
|
|
0c5ffdcc90
|
增加clor
|
2025-06-17 09:24:18 +08:00 |
|
|
|
412350cf8a
|
修改错误信息
|
2025-06-16 14:29:18 +08:00 |
|
|
|
8ce0c39fb1
|
Merge branch 'dev-lzh' into dev
|
2025-06-16 13:41:37 +08:00 |
|
|
|
8a14905343
|
添加金额类型
|
2025-06-16 13:40:50 +08:00 |
|
|
|
cb76c941dd
|
冲突解决
|
2025-06-16 13:34:30 +08:00 |
|
|
|
e1ecefba63
|
Merge branch 'feat-zjy-issue-008' into dev
|
2025-06-16 13:25:58 +08:00 |
|
|
|
38f03838a5
|
fix: 根据orderNo只查询增值服务接口的source写错了
|
2025-06-16 13:25:22 +08:00 |
|
|
|
0da63da9d8
|
Merge branch 'sxy' into dev
|
2025-06-16 13:21:19 +08:00 |
|
|
|
8793f023c9
|
增加批量获取增值服务-1
|
2025-06-16 13:20:54 +08:00 |
|
|
|
9bffde4a62
|
增加批量获取增值服务
|
2025-06-16 13:13:27 +08:00 |
|
|
|
ede67efea9
|
Merge branch 'dev' of https://gitea-inner.fontree.cn/fiee/micro-bundle into dev
|
2025-06-16 11:54:33 +08:00 |
|
|
|
665afeced0
|
Merge branch 'sxy' into dev
|
2025-06-16 11:54:18 +08:00 |
|
|
|
8b2e7c541e
|
修改验证
|
2025-06-16 11:54:04 +08:00 |
|
|
|
7c12b60c32
|
Merge branch 'feat-zjy-issue-008' into dev
|
2025-06-16 11:08:53 +08:00 |
|
|
|
8fe2ea816f
|
fix: 调整order-detail接口，可以根据token直接捞到子订单
|
2025-06-16 11:08:16 +08:00 |
|
|
|
07b6296867
|
添加金额类型
|
2025-06-16 11:05:18 +08:00 |
|
|
|
56dee3eb9d
|
Merge branch 'dev-lzh' into dev
|
2025-06-16 10:58:51 +08:00 |
|
|
|
8c36da313e
|
时间格式修改
|
2025-06-16 10:58:45 +08:00 |
|
|
|
e4445ebf5b
|
Merge branch 'dev-lzh' into dev
|
2025-06-16 10:55:25 +08:00 |
|
|
|
1d9b8bda3a
|
删除调试
|
2025-06-16 10:55:15 +08:00 |
|
|
|
1504285bc8
|
Merge branch 'dev-lzh' into dev
|
2025-06-16 10:52:37 +08:00 |
|
|
|
2fe368cace
|
时间格式修改
|
2025-06-16 10:52:30 +08:00 |
|
|
|
d6cc359a36
|
fix: 新增接口，根据对账单流水号更新对账单支付状态和支付时间。创建对账单根据对账单流水号去重
|
2025-06-16 10:02:20 +08:00 |
|
|
|
6829778c8c
|
fix: 新增接口，根据对账单流水号更新对账单支付状态和支付时间。创建对账单根据对账单流水号去重
|
2025-06-16 10:01:51 +08:00 |
|
|
|
346206b1d3
|
Merge branch 'feat-zjy-issue-008' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
# pb/bundle/bundle_triple.pb.go
|
2025-06-16 10:01:25 +08:00 |
|
|
|
28d92a6ca2
|
添加日志打印
|
2025-06-16 09:57:20 +08:00 |
|
|
|
335f8589ad
|
Merge branch 'dev-lzh' into dev
|
2025-06-16 09:55:47 +08:00 |
|
|
|
7367bf1639
|
默认过期时间使用当前时间
|
2025-06-16 09:55:29 +08:00 |
|
|
|
fb413f80bc
|
fix: 新增接口，根据对账单流水号更新对账单支付状态和支付时间。创建对账单根据对账单流水号去重
|
2025-06-16 09:52:20 +08:00 |
|
|
|
a939b53340
|
Merge branch 'dev-lzh' into dev
|
2025-06-16 09:04:11 +08:00 |
|
|
|
6c7a1f9d44
|
提交时间类型修改
|
2025-06-16 09:03:39 +08:00 |
|
|
|
c8e6c459f1
|
fix: 新增接口，根据orderNo,仅查询它单独购买的增值服务
|
2025-06-15 19:20:31 +08:00 |
|
|
|
4231fdd1f9
|
Merge branch 'feat-zjy-issue-008' into dev
# Conflicts:
# pb/bundle.proto
# pb/bundle/bundle.pb.go
|
2025-06-15 19:20:01 +08:00 |
|
|
|
cb21e13c4e
|
fix: 新增接口，根据orderNo,仅查询它单独购买的增值服务
|
2025-06-15 19:15:30 +08:00 |
|
|
|
76641cd124
|
Merge branch 'feat-zjy-issue-008' into dev
|
2025-06-15 18:49:19 +08:00 |
|
|
|
5205119945
|
fix: 处理bug
|
2025-06-15 18:49:06 +08:00 |
|
|
|
42bd5409f6
|
fix: detail接口增加addBundle的字段
|
2025-06-15 18:31:18 +08:00 |
|
|
|
f9e7f9e13c
|
Merge branch 'feat-zjy-issue-008' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-06-15 18:30:54 +08:00 |
|
