|
|
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 |
|
|
|
50b4009043
|
fix: detail接口增加addBundle的字段
|
2025-06-15 18:29:01 +08:00 |
|
|
|
55bbe63158
|
Merge branch 'jng' into feat-zjy-issue-008
|
2025-06-15 17:57:33 +08:00 |
|
|
|
d8ae7edb3b
|
修改命名
|
2025-06-15 16:00:04 +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 |
|
|
|
70a3e0a317
|
Merge branch 'dev-lzh' into dev
|
2025-06-15 14:25:49 +08:00 |
|
|
|
e6eb835a01
|
补充支付时间字段
|
2025-06-15 14:24:02 +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 |
|
|
|
427b5ce862
|
fix: 漏了
|
2025-06-15 13:01:55 +08:00 |
|
|
|
9c7d3f1435
|
fix: listV2查询增加两个字段CheckoutSessionId和CustomerID，UpdateOrderRecordByOrderNO方法能够改checkSessionId和checkSessionUrl
|
2025-06-15 13:00:21 +08:00 |
|
|
|
f33ecd7b92
|
Merge branch 'dev-lzh' into dev
|
2025-06-15 12:26:59 +08:00 |
|
|
|
459ae0d6fb
|
1
|
2025-06-15 12:26:30 +08:00 |
|
|
|
dc5ba41c0d
|
Merge branch 'dev-lzh' into dev
|
2025-06-15 11:44:28 +08:00 |
|
|
|
edbe9f2c0a
|
添加用户余量信息查询接口
|
2025-06-15 11:43:50 +08:00 |
|
|
|
99f04c1de2
|
添加用户余量信息查询接口
|
2025-06-15 11:34:51 +08:00 |
|
|
|
5157dd589e
|
解决冲突
|
2025-06-15 10:09:08 +08:00 |
|
|
|
b72b7e17ec
|
修改
|
2025-06-15 10:08:40 +08:00 |
|
|
|
8f533c4601
|
Merge branch 'sxy' into dev
|
2025-06-14 17:28:28 +08:00 |
|
|
|
ed66051786
|
修改条件限制
|
2025-06-14 17:28:19 +08:00 |
|
|
|
9415b3b701
|
Merge branch 'sxy' into dev
|
2025-06-14 17:21:39 +08:00 |
|
|
|
c4ef0b5f96
|
修改返回节省金额
|
2025-06-14 17:21:26 +08:00 |
|
|
|
5887473b9e
|
Merge branch 'sxy' into dev
|
2025-06-14 17:19:04 +08:00 |
|
