|
|
412e679b94
|
Merge branch 'sxy' into dev
|
2025-06-18 11:42:56 +08:00 |
|
|
|
4c027c4a08
|
修改
|
2025-06-18 11:42:39 +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 |
|
|
|
412350cf8a
|
修改错误信息
|
2025-06-16 14:29:18 +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 |
|
|
|
56dee3eb9d
|
Merge branch 'dev-lzh' into dev
|
2025-06-16 10:58:51 +08:00 |
|
|
|
8c36da313e
|
时间格式修改
|
2025-06-16 10:58:45 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
70a3e0a317
|
Merge branch 'dev-lzh' into dev
|
2025-06-15 14:25:49 +08:00 |
|
|
|
e6eb835a01
|
补充支付时间字段
|
2025-06-15 14:24:02 +08:00 |
|
|
|
dc5ba41c0d
|
Merge branch 'dev-lzh' into dev
|
2025-06-15 11:44:28 +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 |
|
|
|
f042ca7891
|
修改返回时间
|
2025-06-14 17:18:51 +08:00 |
|
|
|
b1831b09ae
|
Merge branch 'dev-lzh' into dev
|
2025-06-14 16:33:57 +08:00 |
|
|
|
39a172f3dd
|
添加待确认记录查询
|
2025-06-14 16:31:01 +08:00 |
|
|
|
1f0a6c2082
|
111
|
2025-06-14 15:09:15 +08:00 |
|
|
|
7fbb5e59b7
|
添加可用时间扩展支持
|
2025-06-14 11:28:54 +08:00 |
|
|
|
4e79ab7a28
|
Merge branch 'dev-lzh' into dev
|
2025-06-14 10:20:17 +08:00 |
|
|
|
4f56854e36
|
添加作品详情和作品列表
|
2025-06-14 09:41:44 +08:00 |
|
|
|
34d4dc8d84
|
解决冲突
|
2025-06-13 22:37:22 +08:00 |
|
|
|
b8dadc0ee0
|
修改
|
2025-06-13 22:36:54 +08:00 |
|
|
|
4cdb1508a8
|
解决冲突
|
2025-06-13 19:25:22 +08:00 |
|
|
|
2238689f11
|
修改
|
2025-06-13 19:25:00 +08:00 |
|
|
|
01399daa30
|
Merge branch 'dev-lzh' into dev
|
2025-06-13 18:05:39 +08:00 |
|
|
|
895b7cce11
|
修改扩展、余量接口
|
2025-06-13 18:04:31 +08:00 |
|
|
|
539d725a14
|
Merge branch 'sxy' into dev
|
2025-06-13 16:47:46 +08:00 |
|
|
|
3cf6a506a8
|
增加金额计算
|
2025-06-13 16:43:56 +08:00 |
|
|
|
4006092dba
|
扩展记录修改
|
2025-06-13 15:46:29 +08:00 |
|
|
|
26bbfc173f
|
Merge branch 'dev-lzh' into dev
|
2025-06-13 14:20:54 +08:00 |
|
|
|
c8a129d34e
|
拆分模块
|
2025-06-13 14:12:09 +08:00 |
|
