Commits · b27d438b2525bfef853831170732ba2a0dbac537 · phsl / api · GitLab

04 Feb, 2026 2 commits
- Merge remote-tracking branch 'origin/develop' into develop · b27d438b
  Jony.L committed Feb 04, 2026
  
  b27d438b Browse Files
- 大屏平台态势总览接口完成 · 9d6be529
  lijinqi committed Feb 04, 2026
  
  9d6be529 Browse Files
21 Dec, 2025 1 commit
- 修复客户端“我的订单”界面费用显示问题 · 89563018
  Jony.L committed Dec 21, 2025
  
  89563018 Browse Files
01 Dec, 2025 1 commit
- 修复金额格式化：确保保留两位小数 · e1c58c98
  Jony.L committed Dec 01, 2025
  
  e1c58c98 Browse Files
24 Nov, 2025 1 commit
- 实现订单快照功能 · 474b5189
  Jony.L committed Nov 24, 2025
  
  474b5189 Browse Files
11 Nov, 2025 2 commits
- Merge remote-tracking branch 'origin/develop' into develop · 0533ddfb
  Jony.L committed Nov 11, 2025
  
  0533ddfb Browse Files
- 添加定时任务，将进行完的算力资源订单状态改为已结束，并将对应的算力资源spu状态改为回收；定时任务修改，现在过期支付订单的定时任务会同时过期业务订单；添加业务校… · a70ffc20
```
添加定时任务，将进行完的算力资源订单状态改为已结束，并将对应的算力资源spu状态改为回收；定时任务修改，现在过期支付订单的定时任务会同时过期业务订单；添加业务校验 - 同一SPU下不能有相同租赁天数的SKU；移除库存管理 - 从库存控制改为SKU下架控制重复购买，给SPU添加订单完成后的回收状态
```
  Jony.L committed Nov 11, 2025
  a70ffc20 Browse Files
07 Nov, 2025 1 commit
- app-api/resource-sku接口允许任意访问 · aeb07789
  lijinqi committed Nov 07, 2025
  
  aeb07789 Browse Files
04 Nov, 2025 4 commits
- 删除无用的方法 · 7ff393a1
  Jony.L committed Nov 04, 2025
  
  7ff393a1 Browse Files
- Merge remote-tracking branch 'origin/new-pay' into develop · 97b6a8fc
```
# Conflicts:
#	computility-module-compute/computility-module-compute-biz/src/main/java/com/luhu/computility/module/compute/service/resourceorder/ResourceOrderServiceImpl.java
#	computility-module-compute/computility-module-compute-biz/src/main/java/com/luhu/computility/module/compute/service/resourcespu/ResourceSpuServiceImpl.java
```
  Jony.L committed Nov 04, 2025
  97b6a8fc Browse Files
- 算力资源配置增加电源、网卡字段，订单功能相应添加 · 2a046d3a
  Jony.L committed Nov 04, 2025
  
  2a046d3a Browse Files
- 旺铺支付切换成正式环境的参数 · a9b6ed47
  Jony.L committed Nov 04, 2025
  
  a9b6ed47 Browse Files
03 Nov, 2025 9 commits
- wpgj支付魔法数字 · 401ebf7d
  Jony.L committed Nov 03, 2025
  
  401ebf7d Browse Files
- test · a337f9df
  lijinqi committed Nov 03, 2025
  
  a337f9df Browse Files
- wpgj支付测试参数 · 3c8cc0b8
  Jony.L committed Nov 03, 2025
  
  3c8cc0b8 Browse Files
- wpgj支付生产参数 · 5922c247
  Jony.L committed Nov 03, 2025
  
  5922c247 Browse Files
- Merge remote-tracking branch 'origin/new-pay' into new-pay · f0efb4c4
  lijinqi committed Nov 03, 2025
  
  f0efb4c4 Browse Files
- 转第三方支付后，用户资源包列表数据来源修改 · bf5ab3b5
  lijinqi committed Nov 03, 2025
  
  bf5ab3b5 Browse Files
- spu和sku的状态联动更新以及联动删除 · b503abae
  Jony.L committed Nov 03, 2025
  
  b503abae Browse Files
- 修复算力资源SKU bug修复 · ff2c5b32
  lijinqi committed Nov 03, 2025
  
  ff2c5b32 Browse Files
- 首页统计bug修复 · 825976d9
  Jony.L committed Nov 03, 2025
  
  825976d9 Browse Files
02 Nov, 2025 3 commits
- 隐藏购买时暴露的服务器ip · d4952f31
  Jony.L committed Nov 02, 2025
  
  d4952f31 Browse Files
- Merge remote-tracking branch 'origin/new-pay' into new-pay · 1ec5b03e
  Jony.L committed Nov 02, 2025
  
  1ec5b03e Browse Files
- 管理端首页，顶部导航栏统计数据bug修复 · e0ea5f18
  Jony.L committed Nov 02, 2025
  
  e0ea5f18 Browse Files
01 Nov, 2025 3 commits
- Merge branch 'new-pay' of git.lijinqi.com:new-computility/api into new-pay · c1e137db
  李幸鑫 committed Nov 01, 2025
  
  c1e137db Browse Files
- fix bugs · 4a90c71d
  李幸鑫 committed Nov 01, 2025
  
  4a90c71d Browse Files
- 新支付功能-算力资源模块和api模块商品订单过期（改为已取消） · 3dde2664
  Jony.L committed Nov 01, 2025
  
  3dde2664 Browse Files
31 Oct, 2025 2 commits
- 新支付功能-api模块支付重构补全、支付订单过期定时任务 · ff3a5dfc
  Jony.L committed Oct 31, 2025
  
  ff3a5dfc Browse Files
- 新支付功能-api模块支付重构 · f198f6ea
  Jony.L committed Oct 31, 2025
  
  f198f6ea Browse Files
29 Oct, 2025 4 commits
- 删除废弃代码 · fdb05415
  Jony.L committed Oct 29, 2025
  
  fdb05415 Browse Files
- 新支付功能测试7.0 完成回调接口的开发，api模块支付待重构 · 8be5f23c
  Jony.L committed Oct 29, 2025
  
  8be5f23c Browse Files
- 支付回调接口V0.2完成，支付订单状态待修改 · 48277ba8
  lijinqi committed Oct 29, 2025
  
  48277ba8 Browse Files
- 支付回调接口V0.1 · 2ac6fcb6
  lijinqi committed Oct 29, 2025
  
  2ac6fcb6 Browse Files
28 Oct, 2025 1 commit
- 新支付功能测试6.0，继续回调测试 · 842a425c
  Jony.L committed Oct 28, 2025
  
  842a425c Browse Files
27 Oct, 2025 1 commit
- 新支付功能测试4.0，继续回调测试 · fa76472d
  Jony.L committed Oct 27, 2025
  
  fa76472d Browse Files
26 Oct, 2025 1 commit
- 新支付功能测试3.0，修复轮询观察支付状态接口 · 26ab13ea
  Jony.L committed Oct 26, 2025
  
  26ab13ea Browse Files
24 Oct, 2025 4 commits
- 新支付功能测试2.0 · 0381c12b
  Jony.L committed Oct 24, 2025
  
  0381c12b Browse Files
- 新支付功能测试 · 09884fa0
  Jony.L committed Oct 24, 2025
  
  09884fa0 Browse Files
- 新支付功能测试 · f7131a64
  Jony.L committed Oct 24, 2025
  
  f7131a64 Browse Files
- 新支付功能测试 · d3430f5e
  Jony.L committed Oct 24, 2025
  
  d3430f5e Browse Files