|
|
883e5613e6
|
Merge branch 'dev-lzh' into dev
|
2025-06-18 16:47:34 +08:00 |
|
|
|
df0b742168
|
过滤空余量信息
|
2025-06-18 16:47:28 +08:00 |
|
|
|
289518d2f9
|
Merge branch 'dev-lzh' into dev
|
2025-06-18 16:37:09 +08:00 |
|
|
|
a71942b0d4
|
过滤软删除的记录
|
2025-06-18 16:37:01 +08:00 |
|
|
|
e5255d3022
|
Merge branch 'dev-lzh' into dev
|
2025-06-18 16:36:04 +08:00 |
|
|
|
370f0a08c1
|
过滤软删除的记录
|
2025-06-18 16:35:55 +08:00 |
|
|
|
46839556cd
|
Merge branch 'sxy' into dev
|
2025-06-18 16:18:46 +08:00 |
|
|
|
90928cf5c8
|
修改查询-1
|
2025-06-18 16:18:31 +08:00 |
|
|
|
a3e999f345
|
Merge branch 'sxy' into dev
|
2025-06-18 16:03:27 +08:00 |
|
|
|
3cce79adab
|
修改查询
|
2025-06-18 16:03:14 +08:00 |
|
|
|
df96102509
|
Merge branch 'sxy' into dev
|
2025-06-18 15:49:43 +08:00 |
|
|
|
6107e35aca
|
修改
|
2025-06-18 15:49:21 +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 |
|
|
|
0c5ffdcc90
|
增加clor
|
2025-06-17 09:24:18 +08:00 |
|
|
|
8ce0c39fb1
|
Merge branch 'dev-lzh' into dev
|
2025-06-16 13:41:37 +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 |
|
|
|
9bffde4a62
|
增加批量获取增值服务
|
2025-06-16 13:13:27 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
f9e7f9e13c
|
Merge branch 'feat-zjy-issue-008' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-06-15 18:30:54 +08:00 |
|
|
|
50b4009043
|
fix: detail接口增加addBundle的字段
|
2025-06-15 18:29:01 +08:00 |
|
|
|
e9bc29a205
|
Merge branch 'jng' into dev
|
2025-06-15 15:58:57 +08:00 |
|
|
|
f3eb2eef59
|
修改
|
2025-06-15 15:58:49 +08:00 |
|
|
|
4ad9771a3a
|
解决冲突
|
2025-06-15 14:51:25 +08:00 |
|
|
|
b91131b7cd
|
Merge branch 'dev-lzh' into dev
|
2025-06-15 14:36:06 +08:00 |
|
|
|
21504e78f2
|
补充金额字段
|
2025-06-15 14:35:39 +08:00 |
|
|
|
9ef0599430
|
Merge branch 'dev-lzh' into dev
|
2025-06-15 13:50:27 +08:00 |
|
|
|
74277a50ef
|
待确认记录查询
|
2025-06-15 13:50:20 +08:00 |
|
|
|
681589cf4d
|
解决冲突
|
2025-06-15 13:20:43 +08:00 |
|
|
|
d4b8be90ea
|
修改
|
2025-06-15 13:20:14 +08:00 |
|
|
|
3e6382481c
|
1
|
2025-06-15 13:12:55 +08:00 |
|
|
|
9c7d3f1435
|
fix: listV2查询增加两个字段CheckoutSessionId和CustomerID，UpdateOrderRecordByOrderNO方法能够改checkSessionId和checkSessionUrl
|
2025-06-15 13:00:21 +08:00 |
|
