diff --git a/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java b/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java index 67083f6..b32bd94 100644 --- a/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java +++ b/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java @@ -707,13 +707,13 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl userAndMinerMap = orderMiningInfoDtoList.stream().collect(Collectors.toMap(OrderMiningInfoDto::getMachineId, Function.identity())); GoogleInfo googleInfo = leaseUserMapper.getGoogleInfoByEmail(userEmail); - if(googleInfo == null || StringUtils.isBlank(googleInfo.getSecret())){ - //未绑定定谷歌验证器 - return Result.fail("您的账号未开启双重验证,请先开启验证!"); - } - if(!GoogleAuthenticator.checkCode(googleInfo.getSecret(), orderAndCodeVo.getCode(), System.currentTimeMillis())){ - return Result.fail("谷歌验证码错误"); - } + //if(googleInfo == null || StringUtils.isBlank(googleInfo.getSecret())){ + // //未绑定定谷歌验证器 + // return Result.fail("您的账号未开启双重验证,请先开启验证!"); + //} + //if(!GoogleAuthenticator.checkCode(googleInfo.getSecret(), orderAndCodeVo.getCode(), System.currentTimeMillis())){ + // return Result.fail("谷歌验证码错误"); + //} Map collect1 = orderInfoVoList.stream() .collect(Collectors.toMap(OrderInfoVo::getMachineId,Function.identity())); List machineList = leaseMachineMapper.selectBatchIds(collect1.keySet()); diff --git a/src/main/resources/mapper/lease/LeaseMachineMapper.xml b/src/main/resources/mapper/lease/LeaseMachineMapper.xml index 9521114..23852cc 100644 --- a/src/main/resources/mapper/lease/LeaseMachineMapper.xml +++ b/src/main/resources/mapper/lease/LeaseMachineMapper.xml @@ -471,28 +471,28 @@ SET sale_out_numbers = CASE - WHEN id = #{item.id} AND sale_out_numbers = #{item.lockNumbers} - THEN sale_out_numbers + #{item.saleOutNumbers} + WHEN id = #{item.id} + THEN #{item.saleOutNumbers} - ELSE sale_out_numbers + ELSE 0 END, can_sale_numbers = CASE - WHEN id = #{item.id} AND sale_out_numbers = #{item.lockNumbers} - THEN can_sale_numbers - #{item.canSaleNumbers} + WHEN id = #{item.id} + THEN #{item.canSaleNumbers} - ELSE can_sale_numbers + ELSE 0 END, sale_state = CASE - WHEN id = #{item.id} AND sale_out_numbers = #{item.lockNumbers} - THEN CASE WHEN (sale_out_numbers + #{item.saleOutNumbers}) >= sale_numbers THEN 1 ELSE sale_state END + WHEN id = #{item.id} + THEN CASE WHEN sale_out_numbers >= sale_numbers THEN 1 ELSE sale_state END ELSE sale_state END - WHERE id IN ( + WHERE (id, sale_out_numbers) IN ( - #{item.id} + (#{item.id}, #{item.lockNumbers}) )