lizixuan/cloud_hash_backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 2miner 放开gpu在离线情况判定

Browse Source
This commit is contained in:
yyb
2026-02-02 10:49:58 +08:00
parent fd781e6e3e
commit fd4378d101
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java
View File

@@ -765,10 +765,9 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl<LeaseOrderInfoMapper,
return Result.fail("购买的ASIC商品中,存在可售数量不足的商品!"); return Result.fail("购买的ASIC商品中,存在可售数量不足的商品!");
} }
boolean isGpuPass = checkGpuMachine(gpuMachines); boolean isGpuPass = checkGpuMachine(gpuMachines);
//开发环境 if (!isGpuPass){
//if (!isGpuPass){ return Result.fail("购买的GPU商品中,存在客户端不在线的矿机!");
// return Result.fail("购买的GPU商品中,存在客户端不在线的矿机!"); }
//}
//存储相同链和币种的map集合 //存储相同链和币种的map集合
Map<String, Map<String, List<OrderInfoVo>>> chainAndCoinMap = new HashMap<>(); Map<String, Map<String, List<OrderInfoVo>>> chainAndCoinMap = new HashMap<>();
Map<Long, LeaseMachinePrice> orderTotalPriceGroupByChainAndCoin = leaseMachinePriceMapper.getOrderTotalPriceGroupByChainAndCoin(orderInfoVoList); Map<Long, LeaseMachinePrice> orderTotalPriceGroupByChainAndCoin = leaseMachinePriceMapper.getOrderTotalPriceGroupByChainAndCoin(orderInfoVoList);
@@ -961,10 +960,9 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl<LeaseOrderInfoMapper,
if (i != machineIds.size()){ if (i != machineIds.size()){
throw new OrderException("订单中已有商品售出,请刷新购物车删除已售出商品,重新结算生成订单"); throw new OrderException("订单中已有商品售出,请刷新购物车删除已售出商品,重新结算生成订单");
} }
//开发环境 if(!checkGpuMachine(gpuMachines)){
//if(!checkGpuMachine(gpuMachines)){ throw new OrderException("购买的GPU商品中,存在客户端不在线的矿机!");
// throw new OrderException("购买的GPU商品中,存在客户端不在线的矿机!"); }
//}
//gpu矿机处理 发送消息 //gpu矿机处理 发送消息
sendMessageToClientAndInsertPurchasedMachine(SecurityUtils.getUserId(),userEmail,gpuMachines,orderMiningInfoDtoList,endMiningMap,machineOrderIdMap,machineOrderItemIdMap); sendMessageToClientAndInsertPurchasedMachine(SecurityUtils.getUserId(),userEmail,gpuMachines,orderMiningInfoDtoList,endMiningMap,machineOrderIdMap,machineOrderItemIdMap);